summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-03 23:44:18 +0200
committerWolfgang Denk <wd@denx.de>2008-09-03 23:44:18 +0200
commitd459516188af37da22a3b86914dbd81d83fac79f (patch)
treedefe29ba4e93edddd4bb352ac3737a8a8fcdb99e /include
parentce42d166ac3c55ebf1e7c2f9707a79acefa006be (diff)
parent64ac1eb5afafced49b327425ad1814b2dc422d6e (diff)
downloadu-boot-imx-d459516188af37da22a3b86914dbd81d83fac79f.zip
u-boot-imx-d459516188af37da22a3b86914dbd81d83fac79f.tar.gz
u-boot-imx-d459516188af37da22a3b86914dbd81d83fac79f.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
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 */