diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-05-15 10:27:32 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-05-15 10:27:32 +0200 |
| commit | e7f9350525d73233d4eaf1793f8fe618e9fd4910 (patch) | |
| tree | 153366c61e17af4ecdd9f10be520f707d525157d /include/pcmcia.h | |
| parent | 50c8d66d33651d7fca6a082a1eea6e537401a2f4 (diff) | |
| parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
| download | u-boot-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.gz u-boot-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.xz u-boot-e7f9350525d73233d4eaf1793f8fe618e9fd4910.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/pcmcia.h')
| -rw-r--r-- | include/pcmcia.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h index ce8c8ed5e9..952a67c17c 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -22,10 +22,8 @@ #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) /* The RPX series use SLOT_B */ -#if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_RPXLITE) +#if defined(CONFIG_RPXLITE) # define CONFIG_PCMCIA_SLOT_B -#elif defined(CONFIG_ADS) /* The ADS board uses SLOT_A */ -# define CONFIG_PCMCIA_SLOT_A #elif defined(CONFIG_FADS) /* The FADS series are a mess */ # if defined(CONFIG_MPC86x) || defined(CONFIG_MPC821) # define CONFIG_PCMCIA_SLOT_A |