summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-arm720t/hardware.h
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2007-01-30 16:43:18 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2007-01-30 16:43:18 +0800
commitc1c52e38d35ff01f08b55377126c979a08fbdb1d (patch)
tree2c4b7c384ccfc8834693ef392d30b10fc3899237 /include/asm-arm/arch-arm720t/hardware.h
parentfdef388758506765d4d6a7155c8f1584c63ff581 (diff)
parentf8db84f132b1e335f20f96138a1f09ed97b08664 (diff)
downloadtalos-obmc-uboot-c1c52e38d35ff01f08b55377126c979a08fbdb1d.tar.gz
talos-obmc-uboot-c1c52e38d35ff01f08b55377126c979a08fbdb1d.zip
Merge branch 'master' into hpc2
Diffstat (limited to 'include/asm-arm/arch-arm720t/hardware.h')
-rw-r--r--include/asm-arm/arch-arm720t/hardware.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h
index 3056ca7f67..1e9cd41169 100644
--- a/include/asm-arm/arch-arm720t/hardware.h
+++ b/include/asm-arm/arch-arm720t/hardware.h
@@ -36,6 +36,8 @@
/* include armadillo specific hardware file if there was one */
#elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
/* include IntegratorCP/CM720T specific hardware file if there was one */
+#elif defined(CONFIG_LPC2292)
+#include <asm-arm/arch-arm720t/lpc2292_registers.h>
#else
#error No hardware file defined for this configuration
#endif
OpenPOWER on IntegriCloud