diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-05 23:15:17 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-05 23:15:17 (GMT) |
| commit | d86a0a6f7fe433787edf06aecba9fd6abfecab48 (patch) | |
| tree | 005ba8a000e7bdcab42c1df6339bf7e51dcda2ca /drivers/pcmcia/ti_pci1410a.c | |
| parent | a524e112b424c6843800ea2f19d3a8cf01d0aa94 (diff) | |
| parent | f492dd636fbbae529e17533995bc6e5813c007f6 (diff) | |
| download | u-boot-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.xz | |
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/pcmcia/ti_pci1410a.c')
| -rw-r--r-- | drivers/pcmcia/ti_pci1410a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c index 208ca50..c876d0c 100644 --- a/drivers/pcmcia/ti_pci1410a.c +++ b/drivers/pcmcia/ti_pci1410a.c @@ -64,7 +64,7 @@ #include <pcmcia.h> -#if defined(CONFIG_CMD_PCMCIA) && defined(CONFIG_IDE_TI_CARDBUS) +#if defined(CONFIG_CMD_PCMCIA) int pcmcia_on(int ide_base_bus); @@ -662,4 +662,4 @@ static int identify(volatile uchar *p) return 0; /* don't know */ } -#endif /* CONFIG_IDE_TI_CARDBUS */ +#endif /* CONFIG_CMD_PCMCIA */ |