summaryrefslogtreecommitdiff
path: root/include/pcmcia.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-05-17 03:25:30 -0600
committerTom Rini <trini@konsulko.com>2017-05-22 12:45:27 -0400
commitfc843a02acad62e231a3e779cebd1712688146fc (patch)
treeb2811ec28b2378f0b471d3173e59768834d41929 /include/pcmcia.h
parent75eb9976b78ace0e667c1f5faf367acfaed141df (diff)
Kconfig: Add a CONFIG_IDE option
At present IDE support is controlled by CONFIG_CMD_IDE. Add a separate CONFIG_IDE option so that IDE support can be enabled without requiring the 'ide' command. Update existing users and move the ide driver into drivers/block since it should not be in common/. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/pcmcia.h')
-rw-r--r--include/pcmcia.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h
index c8a730c4d0..aaaf6511a8 100644
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -16,7 +16,7 @@
* 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)
@@ -268,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