dm: gpio: Add live tree support

[people/ms/u-boot.git] / include / pcmcia.h

diff --git a/include/pcmcia.h b/include/pcmcia.h
index 7e495bc79a689880afa62888a65e27bc05a17db0..aaaf6511a86ff67936fe155b7d2f5307a010ed6a 100644 (file)
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -16,19 +16,13 @@
  * or try to generate a useful default
  */
 #if defined(CONFIG_CMD_PCMCIA) || \
-    (defined(CONFIG_CMD_IDE) && \
+    (defined(CONFIG_IDE) && \
        (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
 
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
 
 #if defined(CONFIG_TQM8xxL)
 # define       CONFIG_PCMCIA_SLOT_B    /* The TQM8xxL use SLOT_B       */
-#elif defined(CONFIG_IVMS8) || defined(CONFIG_IVML24)  /* The IVM* use SLOT_A  */
-# define CONFIG_PCMCIA_SLOT_A
-#elif defined(CONFIG_LWMON)            /* The LWMON  use SLOT_B        */
-# define CONFIG_PCMCIA_SLOT_B
-#elif defined(CONFIG_ATC)              /* The ATC use SLOT_A   */
-# define CONFIG_PCMCIA_SLOT_A
 #else
 # error "PCMCIA Slot not configured"
 #endif
@@ -274,7 +268,7 @@ extern u_int *pcmcia_pgcrx[];
 #define        PCMCIA_PGCRX(slot)      (*pcmcia_pgcrx[slot])
 #endif
 
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
 extern int check_ide_device(int slot);
 #endif