X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Ftqm8xx_pcmcia.c;h=132c7a5169b649e59a255b5265a34e4f0eff345d;hb=bd86220f58b99d6896198c385fda132f0c980915;hp=b5b93088d4cf1808159a96ab314664c2eb946afd;hpb=b87dfd2854809ddcf4be54d772752e7ed137386f;p=oweals%2Fu-boot.git

diff --git a/drivers/tqm8xx_pcmcia.c b/drivers/tqm8xx_pcmcia.c
index b5b93088d4..132c7a5169 100644
--- a/drivers/tqm8xx_pcmcia.c
+++ b/drivers/tqm8xx_pcmcia.c
@@ -3,16 +3,18 @@
 /* SC8xx   Boards by SinoVee Microsystems				*/
 /* -------------------------------------------------------------------- */
 #include <common.h>
+#ifdef CONFIG_8xx
 #include <mpc8xx.h>
+#endif
 #include <pcmcia.h>
 
 #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
 
@@ -239,11 +241,9 @@ int pcmcia_hardware_enable(int slot)
 }
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 int pcmcia_hardware_disable(int slot)
 {
-	volatile pcmconf8xx_t *pcmp =
-		(pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia));
 	u_long reg;
 
 	debug ("hardware_disable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot);
@@ -263,14 +263,16 @@ int pcmcia_hardware_disable(int slot)
 
 	return (0);
 }
-#endif	/* CFG_CMD_PCMCIA */
+#endif
 
 int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {
 #ifndef CONFIG_NSCU
+	u_long reg;
+# ifdef DEBUG
 	volatile pcmconf8xx_t *pcmp =
 		(pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia));
-	u_long reg;
+# endif
 
 	debug ("voltage_set: " PCMCIA_BOARD_MSG
 		" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",