Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -5
+2 -1
arch/m68k/hp300/config.c
··· 24 24 25 25 unsigned long hp300_model; 26 26 unsigned long hp300_uart_scode = -1; 27 - unsigned char ledstate; 27 + unsigned char hp300_ledstate; 28 + EXPORT_SYMBOL(hp300_ledstate); 28 29 29 30 static char s_hp330[] __initdata = "330"; 30 31 static char s_hp340[] __initdata = "340";
+4 -4
arch/m68k/include/asm/blinken.h
··· 17 17 18 18 #define HP300_LEDS 0xf001ffff 19 19 20 - extern unsigned char ledstate; 20 + extern unsigned char hp300_ledstate; 21 21 22 22 static __inline__ void blinken_leds(int on, int off) 23 23 { 24 24 if (MACH_IS_HP300) 25 25 { 26 - ledstate |= on; 27 - ledstate &= ~off; 28 - out_8(HP300_LEDS, ~ledstate); 26 + hp300_ledstate |= on; 27 + hp300_ledstate &= ~off; 28 + out_8(HP300_LEDS, ~hp300_ledstate); 29 29 } 30 30 } 31 31