summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/global_data.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:57 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:43 -0500
commit43e60814b3ee690c02ebf86391b341aeaef9fb0e (patch)
tree077ac17b4998590b882eebd6775c7d3e72cf8826 /arch/powerpc/include/asm/global_data.h
parent3c4c308c0057bb731ac20de1f2b9a3c509008ad0 (diff)
downloadblackbird-obmc-uboot-43e60814b3ee690c02ebf86391b341aeaef9fb0e.tar.gz
blackbird-obmc-uboot-43e60814b3ee690c02ebf86391b341aeaef9fb0e.zip
ppc: Move arbiter fields to arch_global_data
Move arbiter_event_attributes and arbiter_event_address into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/powerpc/include/asm/global_data.h')
-rw-r--r--arch/powerpc/include/asm/global_data.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 136b918055..b7534cd5a0 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -108,6 +108,10 @@ struct arch_global_data {
unsigned long flb_clk;
#endif
unsigned long reset_status; /* reset status register at boot */
+#if defined(CONFIG_MPC83xx)
+ unsigned long arbiter_event_attributes;
+ unsigned long arbiter_event_address;
+#endif
};
/*
@@ -131,10 +135,6 @@ typedef struct global_data {
u32 sdhc_clk;
#endif
phys_size_t ram_size; /* RAM size */
-#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 */
OpenPOWER on IntegriCloud