kconfig: fix another bug of "make savedefconfig"

[u-boot] / drivers / pcmcia / tqm8xx_pcmcia.c

diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index 859cbe057520e8397168d71fccfbaac6632b56ae..8b7447853bf7de655dfdcc62bec75cc1f82e0d4f 100644 (file)
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -20,14 +20,12 @@
 #endif
 
 #if    defined(CONFIG_PCMCIA)  \
-       && (defined(CONFIG_TQM8xxL) || defined(CONFIG_SVM_SC8xx))
+       && defined(CONFIG_TQM8xxL)
 
 #if    defined(CONFIG_VIRTLAB2)
 #define        PCMCIA_BOARD_MSG        "Virtlab2"
 #elif  defined(CONFIG_TQM8xxL)
 #define        PCMCIA_BOARD_MSG        "TQM8xxL"
-#elif  defined(CONFIG_SVM_SC8xx)
-#define        PCMCIA_BOARD_MSG        "SC8xx"
 #endif
 
 #if    defined(CONFIG_NSCU)
@@ -43,19 +41,28 @@ static inline void power_config(int slot) {}
 
 static inline void power_off(int slot)
 {
-       out_be32(PCMCIA_CTRL, 0);
+       volatile unsigned __iomem *addr;
+       addr = (volatile unsigned __iomem *)PCMCIA_CTRL;
+
+       out_be32(addr, 0);
 }
 
 static inline void power_on_5_0(int slot)
 {
+       volatile unsigned __iomem *addr;
+       addr = (volatile unsigned __iomem *)PCMCIA_CTRL;
+
        /* Enable 5V Vccout */
-       out_be32(PCMCIA_CTRL, 2);
+       out_be32(addr, 2);
 }
 
 static inline void power_on_3_3(int slot)
 {
+       volatile unsigned __iomem *addr;
+       addr = (volatile unsigned __iomem *)PCMCIA_CTRL;
+
        /* Enable 3.3V Vccout */
-       out_be32(PCMCIA_CTRL, 1);
+       out_be32(addr, 1);
 }
 
 #else
@@ -293,4 +300,4 @@ done:
        return 0;
 }
 
-#endif /* CONFIG_PCMCIA && (CONFIG_TQM8xxL || CONFIG_SVM_SC8xx) */
+#endif /* CONFIG_PCMCIA && CONFIG_TQM8xxL */