drivers/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

diff --git a/drivers/bcm570x.c b/drivers/bcm570x.c
index b00bcd772fc9d3f0a16fe3280ae8847dac40c1d7..703cda4865318ddfa35ad56730c1d7c3d053e7a2 100644 (file)
--- a/drivers/bcm570x.c
+++ b/drivers/bcm570x.c
@@ -1688,4 +1688,4 @@ QQ_GetTail(
     return pQueue->Array[Idx];
 }
 
-#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_BCM570x */
+#endif

diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index 617361e405fc743555a26ec0768a2cd484a9540b..bcf877194e0fdbc5b08514f017c33de8e7decf19 100644 (file)
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -63,7 +63,7 @@
                               loop in VIDEO_TSTC_FCT (i8042)
  CFG_CONSOLE_BLINK_COUNT     - value for delay loop - blink rate
  CONFIG_CONSOLE_TIME        - display time/date in upper right corner,
-                              needs CFG_CMD_DATE and CONFIG_CONSOLE_CURSOR
+                              needs CONFIG_CMD_DATE and CONFIG_CONSOLE_CURSOR
  CONFIG_VIDEO_LOGO          - display Linux Logo in upper left corner
  CONFIG_VIDEO_BMP_LOGO      - use bmp_logo instead of linux_logo
  CONFIG_CONSOLE_EXTRA_INFO   - display additional board information strings
@@ -175,9 +175,9 @@ CONFIG_VIDEO_HW_CURSOR:          - Uses the hardware cursor capability of the
 #include <linux/types.h>
 #include <devices.h>
 #include <video_font.h>
-#ifdef CFG_CMD_DATE
-#include <rtc.h>
 
+#if defined(CONFIG_CMD_DATE)
+#include <rtc.h>
 #endif
 
 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)

diff --git a/drivers/dc2114x.c b/drivers/dc2114x.c
index 721bbfc2ff0c727735e1f64d3f0c5cabdef2c155..d5275dceb0fb6a8603f4881b16d32d4dc40fe4f8 100644 (file)
--- a/drivers/dc2114x.c
+++ b/drivers/dc2114x.c
@@ -768,4 +768,4 @@ static void update_srom(struct eth_device *dev, bd_t *bis)
 }
 #endif /* UPDATE_SROM */
 
-#endif /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_TULIP */
+#endif

diff --git a/drivers/mpc8xx_pcmcia.c b/drivers/mpc8xx_pcmcia.c
index 04c44a44bf37ec6f7f1004b498f4d0d1e3d6266c..8a34cd305474258db521207ecde5528aaabaef6e 100644 (file)
--- a/drivers/mpc8xx_pcmcia.c
+++ b/drivers/mpc8xx_pcmcia.c
@@ -221,7 +221,7 @@ int pcmcia_off (void)
        pcmcia_hardware_disable(_slot_);
        return 0;
 }
-#endif /* CFG_CMD_PCMCIA */
+#endif
 
 
 static u_int m8xx_get_graycode(u_int size)

diff --git a/drivers/rtl8139.c b/drivers/rtl8139.c
index 4954cd0f7dfda4ef13be030c9a53a523ddb93f32..9045523a3126a4cef541a7da2b1d035a6a601314 100644 (file)
--- a/drivers/rtl8139.c
+++ b/drivers/rtl8139.c
@@ -535,4 +535,4 @@ static void rtl_disable(struct eth_device *dev)
                udelay (100); /* wait 100us */
        }
 }
-#endif /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_RTL8139 */
+#endif

diff --git a/drivers/tigon3.c b/drivers/tigon3.c
index 7506a67003b7b9295ce8939fc3c89ac1739548ea..860a8894fc760f3b58bac8a516bbb633ef104eb4 100644 (file)
--- a/drivers/tigon3.c
+++ b/drivers/tigon3.c
@@ -6197,4 +6197,4 @@ LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
     }
     return LM_STATUS_SUCCESS;
 }
-#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_TIGON3 */
+#endif

diff --git a/drivers/tqm8xx_pcmcia.c b/drivers/tqm8xx_pcmcia.c
index ce4b006a7fa34c5710fd8b0935177c8a91a4d578..132c7a5169b649e59a255b5265a34e4f0eff345d 100644 (file)
--- a/drivers/tqm8xx_pcmcia.c
+++ b/drivers/tqm8xx_pcmcia.c
@@ -263,7 +263,7 @@ int pcmcia_hardware_disable(int slot)
 
        return (0);
 }
-#endif /* CFG_CMD_PCMCIA */
+#endif
 
 int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {