leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m68k/hp300: Export hp300_ledstate

Browse Source 
The accidental loss of CONFIG_DIO in commit
0e152d8050 ("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>
This commit is contained in:
Geert Uytterhoeven 2011-11-07 21:14:43 +01:00
parent 9d7a51d509
commit f808b86507
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m68k/hp300/config.c
View File

@ -24,7 +24,8 @@
unsigned long hp300_model; unsigned long hp300_model;
unsigned long hp300_uart_scode = -1; unsigned long hp300_uart_scode = -1;
unsigned char ledstate; unsigned char hp300_ledstate;
EXPORT_SYMBOL(hp300_ledstate);
static char s_hp330[] __initdata = "330"; static char s_hp330[] __initdata = "330";
static char s_hp340[] __initdata = "340"; static char s_hp340[] __initdata = "340";

8
arch/m68k/include/asm/blinken.h
View File

@ -17,15 +17,15 @@
#define HP300_LEDS 0xf001ffff #define HP300_LEDS 0xf001ffff
extern unsigned char ledstate; extern unsigned char hp300_ledstate;
static __inline__ void blinken_leds(int on, int off) static __inline__ void blinken_leds(int on, int off)
{ {
if (MACH_IS_HP300) if (MACH_IS_HP300)
{ {
ledstate |= on; hp300_ledstate |= on;
ledstate &= ~off; hp300_ledstate &= ~off;
out_8(HP300_LEDS, ~ledstate); out_8(HP300_LEDS, ~hp300_ledstate);
} }
} }