From 06fa24ba9a19de69f69429695af450d3851b1be8 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 7 Nov 2011 21:14:43 +0100 Subject: [PATCH] --- yaml --- r: 280015 b: refs/heads/master c: f808b8650788f78bc1e5e693712e7d7603ab26bc h: refs/heads/master i: 280013: f7d7a085593c707529a3d597560bcf674786d597 280011: ebe952c3b2c34fc6c8f368d2b0a745b2e94023bd 280007: 4656ad4861dd7703778118b0a2abfb9baf5a81ba 279999: fa2f501c55915e7858882258b9759be5663e9913 v: v3 --- [refs] | 2 +- trunk/arch/m68k/hp300/config.c | 3 ++- trunk/arch/m68k/include/asm/blinken.h | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 14378033d4e9..b682765c50ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d7a51d509a8b28fc1217fe11842fb8bbc184c44 +refs/heads/master: f808b8650788f78bc1e5e693712e7d7603ab26bc diff --git a/trunk/arch/m68k/hp300/config.c b/trunk/arch/m68k/hp300/config.c index 1c05a6260546..bf16af1edacf 100644 --- a/trunk/arch/m68k/hp300/config.c +++ b/trunk/arch/m68k/hp300/config.c @@ -24,7 +24,8 @@ unsigned long hp300_model; 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_hp340[] __initdata = "340"; diff --git a/trunk/arch/m68k/include/asm/blinken.h b/trunk/arch/m68k/include/asm/blinken.h index 1a749cf7b06d..0626582a7db4 100644 --- a/trunk/arch/m68k/include/asm/blinken.h +++ b/trunk/arch/m68k/include/asm/blinken.h @@ -17,15 +17,15 @@ #define HP300_LEDS 0xf001ffff -extern unsigned char ledstate; +extern unsigned char hp300_ledstate; static __inline__ void blinken_leds(int on, int off) { if (MACH_IS_HP300) { - ledstate |= on; - ledstate &= ~off; - out_8(HP300_LEDS, ~ledstate); + hp300_ledstate |= on; + hp300_ledstate &= ~off; + out_8(HP300_LEDS, ~hp300_ledstate); } }