---

yaml --- r: 280015 b: refs/heads/master c: f808b86 h: refs/heads/master i: 280013: f7d7a08 280011: ebe952c 280007: 4656ad4 279999: fa2f501 v: v3
git-mirror · Dec 10, 2011 · 06fa24b · 06fa24b
1 parent dc15045
commit 06fa24b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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);
 	}
 }