From b58b478ee3138b25db2cf296d55f7522863bc0b6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 18 Feb 2008 15:21:30 -0800
Subject: [PATCH] --- yaml --- r: 85865 b: refs/heads/master c:
 101788b0ab5464cf485c5d434ac30563e6f9e5fe h: refs/heads/master i:   85863:
 c0100055de4c40e6cf47a35605e87d88446bfc89 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc64/kernel/process.c | 7 -------
 trunk/arch/sparc64/kernel/setup.c   | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5579d38b41f7..4189fc6af859 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d5509aa6985b256a426e67ae6952fd4b7664de7
+refs/heads/master: 101788b0ab5464cf485c5d434ac30563e6f9e5fe
diff --git a/trunk/arch/sparc64/kernel/process.c b/trunk/arch/sparc64/kernel/process.c
index 1b2379174988..d7e8e80d43a5 100644
--- a/trunk/arch/sparc64/kernel/process.c
+++ b/trunk/arch/sparc64/kernel/process.c
@@ -114,15 +114,12 @@ void cpu_idle(void)
 extern char reboot_command [];
 
 extern void (*prom_palette)(int);
-extern void (*prom_keyboard)(void);
 
 void machine_halt(void)
 {
 	sstate_halt();
 	if (prom_palette)
 		prom_palette (1);
-	if (prom_keyboard)
-		prom_keyboard();
 	prom_halt();
 	panic("Halt failed!");
 }
@@ -132,8 +129,6 @@ void machine_alt_power_off(void)
 	sstate_poweroff();
 	if (prom_palette)
 		prom_palette(1);
-	if (prom_keyboard)
-		prom_keyboard();
 	prom_halt_power_off();
 	panic("Power-off failed!");
 }
@@ -147,8 +142,6 @@ void machine_restart(char * cmd)
 	if (p) *p = 0;
 	if (prom_palette)
 		prom_palette (1);
-	if (prom_keyboard)
-		prom_keyboard();
 	if (cmd)
 		prom_reboot(cmd);
 	if (*reboot_command)
diff --git a/trunk/arch/sparc64/kernel/setup.c b/trunk/arch/sparc64/kernel/setup.c
index 82b4d091e4f4..577c823b0529 100644
--- a/trunk/arch/sparc64/kernel/setup.c
+++ b/trunk/arch/sparc64/kernel/setup.c
@@ -69,7 +69,6 @@ struct screen_info screen_info = {
 };
 
 void (*prom_palette)(int);
-void (*prom_keyboard)(void);
 
 static void
 prom_console_write(struct console *con, const char *s, unsigned n)