diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-14 08:25:13 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-14 08:25:13 +0200 |
| commit | becbbc7b2a1be44d38779c80ce94fb20e5e13f12 (patch) | |
| tree | 38e933b70075e14b21fbb0eb891cc8c59d8e60be /drivers/block/sil680.c | |
| parent | bc9019e19758a19a388fb20ef18dc771cd39fdda (diff) | |
| parent | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (diff) | |
| download | u-boot-imx-becbbc7b2a1be44d38779c80ce94fb20e5e13f12.zip u-boot-imx-becbbc7b2a1be44d38779c80ce94fb20e5e13f12.tar.gz u-boot-imx-becbbc7b2a1be44d38779c80ce94fb20e5e13f12.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'drivers/block/sil680.c')
| -rw-r--r-- | drivers/block/sil680.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/sil680.c b/drivers/block/sil680.c index a6143df..052c3d3 100644 --- a/drivers/block/sil680.c +++ b/drivers/block/sil680.c @@ -27,7 +27,7 @@ * The following parameters must be defined in the configuration file * of the target board: * - * #define CFG_IDE_SIL680 + * #define CONFIG_IDE_SIL680 * * #define CONFIG_PCI_PNP * NOTE it may also be necessary to define this if the default of 8 is @@ -54,7 +54,6 @@ */ #include <common.h> -#if defined(CFG_IDE_SIL680) #include <ata.h> #include <ide.h> #include <pci.h> @@ -106,5 +105,3 @@ int ide_preinit (void) void ide_set_reset (int flag) { return; } - -#endif /* CFG_IDE_SIL680 */ |