X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fpcmcia.h;h=0cc7f3ba54e27ca7eb70f4461fda6fab016240d4;hb=b278c4095b59c40ff512c5433b735b000e547554;hp=b60323d3c09cedc278e465899e839caaec43d72f;hpb=cb5473205206c7f14cbb1e747f28ec75b48826e2;p=u-boot diff --git a/include/pcmcia.h b/include/pcmcia.h index b60323d3c0..0cc7f3ba54 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -58,8 +58,6 @@ # define CONFIG_PCMCIA_SLOT_B #elif defined(CONFIG_ICU862) /* The ICU862 use SLOT_B */ # define CONFIG_PCMCIA_SLOT_B -#elif defined(CONFIG_C2MON) /* The C2MON use SLOT_B */ -# define CONFIG_PCMCIA_SLOT_B #elif defined(CONFIG_R360MPI) /* The R360MPI use SLOT_B */ # define CONFIG_PCMCIA_SLOT_B #elif defined(CONFIG_ATC) /* The ATC use SLOT_A */ @@ -313,8 +311,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