---

yaml --- r: 120137 b: refs/heads/master c: b94ea27 h: refs/heads/master i: 120135: 48a0eca v: v3
git-mirror · Dec 22, 2008 · 10cc419 · 10cc419
1 parent 040ae82
commit 10cc419
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 167 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0c14e447a399eb90a1c9a4357560c2a29ef499
+refs/heads/master: b94ea27570e4ae87942e2f2ae386d4007ef7ac58
diff --git a/trunk/arch/sh/boards/mach-cayman/Makefile b/trunk/arch/sh/boards/mach-cayman/Makefile
@@ -2,4 +2,3 @@
 # Makefile for the Hitachi Cayman specific parts of the kernel
 #
 obj-y := setup.o irq.o
-obj-$(CONFIG_HEARTBEAT)	+= led.o
diff --git a/trunk/arch/sh/boards/mach-cayman/led.c b/trunk/arch/sh/boards/mach-cayman/led.c
diff --git a/trunk/arch/sh/boards/mach-microdev/Makefile b/trunk/arch/sh/boards/mach-microdev/Makefile
@@ -3,6 +3,3 @@
 #
 
 obj-y	 := setup.o irq.o io.o
-
-obj-$(CONFIG_HEARTBEAT)	+= led.o
-
diff --git a/trunk/arch/sh/boards/mach-microdev/led.c b/trunk/arch/sh/boards/mach-microdev/led.c
diff --git a/trunk/arch/sh/boards/mach-microdev/setup.c b/trunk/arch/sh/boards/mach-microdev/setup.c
@@ -18,12 +18,6 @@
 #include <asm/io.h>
 #include <asm/machvec.h>
 
-extern void microdev_heartbeat(void);
-
-
-/****************************************************************************/
-
-
 	/*
 	 * Setup for the SMSC FDC37C93xAPM
 	 */
@@ -398,8 +392,4 @@ static struct sh_machine_vector mv_sh4202_microdev __initmv = {
 	.mv_outsl		= microdev_outsl,
 
 	.mv_init_irq		= init_microdev_irq,
-
-#ifdef CONFIG_HEARTBEAT
-	.mv_heartbeat		= microdev_heartbeat,
-#endif
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,3 @@
		#

		obj-y := setup.o irq.o io.o

		obj-$(CONFIG_HEARTBEAT) += led.o