diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
| commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/ide.h | |
| parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/ide.h')
| -rw-r--r-- | include/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ide.h b/include/ide.h index 222f4f8..ddb9579 100644 --- a/include/ide.h +++ b/include/ide.h @@ -26,7 +26,7 @@ #define IDE_BUS(dev) (dev >> 1) -#define ATA_CURR_BASE(dev) (CFG_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)]) +#define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)]) #ifdef CONFIG_IDE_LED @@ -40,7 +40,7 @@ #endif /* CONFIG_IDE_LED */ -#ifdef CFG_64BIT_LBA +#ifdef CONFIG_SYS_64BIT_LBA typedef uint64_t lbaint_t; #else typedef ulong lbaint_t; |