imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / fads / pcmcia.c

diff --git a/board/fads/pcmcia.c b/board/fads/pcmcia.c
index 978c16b9412e4893904b1828cf02b53245b2c1d6..99fe0b4fb97db038b47777693b03dd5fe1f8a0c1 100755 (executable)
--- a/board/fads/pcmcia.c
+++ b/board/fads/pcmcia.c
@@ -4,11 +4,11 @@
 
 #undef CONFIG_PCMCIA
 
-#if    (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 #define        CONFIG_PCMCIA
 #endif
 
-#if    (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
 #define        CONFIG_PCMCIA
 #endif
 
@@ -62,7 +62,7 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
        *((uint *)BCSR1) |= reg;
 #endif
 
-       *((uint *)BCSR1) |= reg << 20;
+       *((uint *)BCSR1) |= reg << 20;
 
        return 0;
 }
@@ -73,12 +73,12 @@ int pcmcia_hardware_enable(int slot)
        return 0;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 int pcmcia_hardware_disable(int slot)
 {
        *((uint *)BCSR1) &= ~BCSR1_PCCEN;
        return 0;
 }
-#endif /* CFG_CMD_PCMCIA */
+#endif
 
 #endif /* CONFIG_PCMCIA */