summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/hardware
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-11-03 09:09:08 -0800
committerTony Luck <tony.luck@intel.com>2005-11-03 09:09:08 -0800
commit55725495f2175d0be2a5ed4135c2ea298b470001 (patch)
tree6005d0c7a95d994bf7ec8e6410dbd5a573e86fdf /include/asm-arm/hardware
parent067794a1170ef61e295aea1719cf4a1ce20200f8 (diff)
parent06024f217d607369f0ee0071034ebb03071d5fb2 (diff)
downloadblackbird-op-linux-55725495f2175d0be2a5ed4135c2ea298b470001.tar.gz
blackbird-op-linux-55725495f2175d0be2a5ed4135c2ea298b470001.zip
Auto-update from upstream
Diffstat (limited to 'include/asm-arm/hardware')
-rw-r--r--include/asm-arm/hardware/amba_clcd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/hardware/amba_clcd.h b/include/asm-arm/hardware/amba_clcd.h
index ce4cf5c1c05d..6b8d73dc1ab0 100644
--- a/include/asm-arm/hardware/amba_clcd.h
+++ b/include/asm-arm/hardware/amba_clcd.h
@@ -22,7 +22,7 @@
#define CLCD_UBAS 0x00000010
#define CLCD_LBAS 0x00000014
-#ifndef CONFIG_ARCH_VERSATILE
+#if !defined(CONFIG_ARCH_VERSATILE) && !defined(CONFIG_ARCH_REALVIEW)
#define CLCD_IENB 0x00000018
#define CLCD_CNTL 0x0000001c
#else
OpenPOWER on IntegriCloud