projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
[platform/kernel/u-boot.git]
/
include
/
asm-ppc
/
global_data.h
diff --git
a/include/asm-ppc/global_data.h
b/include/asm-ppc/global_data.h
index
1f1583a
..
4676e2c
100644
(file)
--- 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
-#if
def CONFIG_LWMON
+#if
defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
unsigned long kbd_status;
#endif
void **jt; /* jump table */