summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-29 00:53:51 +0200
committerWolfgang Denk <wd@denx.de>2007-08-29 00:53:51 +0200
commit20640002e6426770ff93235e14604376dd0dcea8 (patch)
treeca26d48ece75ac65e9a54b6463ba789762666a74 /include/asm-ppc
parenta861558c65f65f1cf1302f3a35e9db7686b9e1a3 (diff)
parent9c02defc29b57945b600714cf61ddfd02b02fb14 (diff)
downloadu-boot-imx-20640002e6426770ff93235e14604376dd0dcea8.zip
u-boot-imx-20640002e6426770ff93235e14604376dd0dcea8.tar.gz
u-boot-imx-20640002e6426770ff93235e14604376dd0dcea8.tar.bz2
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/global_data.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 1f1583a..4676e2c 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -133,7 +133,7 @@ typedef struct global_data {
unsigned long do_mdm_init;
unsigned long be_quiet;
#endif
-#ifdef CONFIG_LWMON
+#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
unsigned long kbd_status;
#endif
void **jt; /* jump table */