Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / include / pcmcia.h

diff --git a/include/pcmcia.h b/include/pcmcia.h
index b60323d3c09cedc278e465899e839caaec43d72f..ca0bf224f1588f709e4a900275e3bc0a5db7a42d 100644 (file)
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -313,8 +313,7 @@ extern u_int *pcmcia_pgcrx[];
 #define        PCMCIA_PGCRX(slot)      (*pcmcia_pgcrx[slot])
 #endif
 
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) \
-       || defined(CONFIG_PXA_PCMCIA)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
 extern int check_ide_device(int slot);
 #endif