summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:49:04 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:44 -0500
commit225ca83dfea4f9b9a313c5233297132206bff431 (patch)
tree35b2849f306377e029a572df0e885f92b26f0c1b /arch/powerpc
parenta0d3c820c43e040b001c912a717942219e0fe3ab (diff)
downloadblackbird-obmc-uboot-225ca83dfea4f9b9a313c5233297132206bff431.tar.gz
blackbird-obmc-uboot-225ca83dfea4f9b9a313c5233297132206bff431.zip
ppc: Move kbd_status to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/global_data.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index b138e6460b..ea675373c1 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -128,6 +128,9 @@ struct arch_global_data {
#if defined(CONFIG_WD_MAX_RATE)
unsigned long long wdt_last; /* trace watch-dog triggering rate */
#endif
+#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
+ unsigned long kbd_status;
+#endif
};
/*
@@ -173,9 +176,6 @@ typedef struct global_data {
unsigned long do_mdm_init;
unsigned long be_quiet;
#endif
-#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
- unsigned long kbd_status;
-#endif
void **jt; /* jump table */
char env_buf[32]; /* buffer for getenv() before reloc. */
struct arch_global_data arch; /* architecture-specific data */
OpenPOWER on IntegriCloud