summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-03 23:44:42 +0200
committerWolfgang Denk <wd@denx.de>2008-09-03 23:44:42 +0200
commitf158c3d51838474c4c36af365af145fbaf92b694 (patch)
treeee5d7d659778792d384fedb12670a0c4999b2b79 /include
parent53c987f51391c1a221b0468aa0f37a3a6ce9181a (diff)
parentd459516188af37da22a3b86914dbd81d83fac79f (diff)
downloadu-boot-imx-f158c3d51838474c4c36af365af145fbaf92b694.zip
u-boot-imx-f158c3d51838474c4c36af365af145fbaf92b694.tar.gz
u-boot-imx-f158c3d51838474c4c36af365af145fbaf92b694.tar.bz2
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/global_data.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index c09b07d..a9366c3 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -122,6 +122,10 @@ typedef struct global_data {
phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */
+#if defined(CONFIG_MPC83XX)
+ unsigned long arbiter_event_attributes;
+ unsigned long arbiter_event_address;
+#endif
unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Checksum of Environment valid? */
unsigned long have_console; /* serial_init() was called */