diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/asm-sparc/io.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'include/asm-sparc/io.h')
| -rw-r--r-- | include/asm-sparc/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index ede0b1a8d..5f8d05cc3 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h @@ -32,7 +32,7 @@ * over and over again resulting in a hang (until an IRQ if lucky) * */ -#ifndef CFG_HAS_NO_CACHE +#ifndef CONFIG_SYS_HAS_NO_CACHE #define READ_BYTE(var) SPARC_NOCACHE_READ_BYTE((unsigned int)(var)) #define READ_HWORD(var) SPARC_NOCACHE_READ_HWORD((unsigned int)(var)) #define READ_WORD(var) SPARC_NOCACHE_READ((unsigned int)(var)) |