diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-07 15:14:43 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-12-10 13:52:48 -0500 |
commit | f808b8650788f78bc1e5e693712e7d7603ab26bc (patch) | |
tree | ca3ad5ef5c96a67448d499aec43215c56e4e5f7c /arch/m68k | |
parent | 9d7a51d509a8b28fc1217fe11842fb8bbc184c44 (diff) |
m68k/hp300: Export hp300_ledstate
The accidental loss of CONFIG_DIO in commit
0e152d80507b75c00aac60f2ffc586360687cd52 ("m68k: reorganize Kconfig options
to improve mmu/non-mmu selections") exposed a missing symbol export in
m68k allmodconfig. If CONFIG_HP300=y but CONFIG_HPLANCE (which is bool,
and depends on CONFIG_DIO) is not set, and CONFIG_MVME147=y and
CONFIG_MVME147_NET=m, 7990.c is compiled as a module, giving:
ERROR: "ledstate" [drivers/net/ethernet/amd/7990.ko] undefined!
Add the missing export, and rename ledstate to hp300_ledstate while we're
at it, as it's a too generic name.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/hp300/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/include/asm/blinken.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index 1c05a6260546..bf16af1edacf 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c | |||
@@ -24,7 +24,8 @@ | |||
24 | 24 | ||
25 | unsigned long hp300_model; | 25 | unsigned long hp300_model; |
26 | unsigned long hp300_uart_scode = -1; | 26 | unsigned long hp300_uart_scode = -1; |
27 | unsigned char ledstate; | 27 | unsigned char hp300_ledstate; |
28 | EXPORT_SYMBOL(hp300_ledstate); | ||
28 | 29 | ||
29 | static char s_hp330[] __initdata = "330"; | 30 | static char s_hp330[] __initdata = "330"; |
30 | static char s_hp340[] __initdata = "340"; | 31 | static char s_hp340[] __initdata = "340"; |
diff --git a/arch/m68k/include/asm/blinken.h b/arch/m68k/include/asm/blinken.h index 1a749cf7b06d..0626582a7db4 100644 --- a/arch/m68k/include/asm/blinken.h +++ b/arch/m68k/include/asm/blinken.h | |||
@@ -17,15 +17,15 @@ | |||
17 | 17 | ||
18 | #define HP300_LEDS 0xf001ffff | 18 | #define HP300_LEDS 0xf001ffff |
19 | 19 | ||
20 | extern unsigned char ledstate; | 20 | extern unsigned char hp300_ledstate; |
21 | 21 | ||
22 | static __inline__ void blinken_leds(int on, int off) | 22 | static __inline__ void blinken_leds(int on, int off) |
23 | { | 23 | { |
24 | if (MACH_IS_HP300) | 24 | if (MACH_IS_HP300) |
25 | { | 25 | { |
26 | ledstate |= on; | 26 | hp300_ledstate |= on; |
27 | ledstate &= ~off; | 27 | hp300_ledstate &= ~off; |
28 | out_8(HP300_LEDS, ~ledstate); | 28 | out_8(HP300_LEDS, ~hp300_ledstate); |
29 | } | 29 | } |
30 | } | 30 | } |
31 | 31 | ||