diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-18 18:21:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-18 18:21:30 -0500 |
commit | 101788b0ab5464cf485c5d434ac30563e6f9e5fe (patch) | |
tree | f89b320d6c53decc6608992be0470a80c92fe6b0 | |
parent | 1d5509aa6985b256a426e67ae6952fd4b7664de7 (diff) |
[SPARC64]: Kill 'prom_keyboard'.
Nothing ever sets it, so it just takes up space.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/process.c | 7 | ||||
-rw-r--r-- | arch/sparc64/kernel/setup.c | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 1b2379174988..d7e8e80d43a5 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -114,15 +114,12 @@ void cpu_idle(void) | |||
114 | extern char reboot_command []; | 114 | extern char reboot_command []; |
115 | 115 | ||
116 | extern void (*prom_palette)(int); | 116 | extern void (*prom_palette)(int); |
117 | extern void (*prom_keyboard)(void); | ||
118 | 117 | ||
119 | void machine_halt(void) | 118 | void machine_halt(void) |
120 | { | 119 | { |
121 | sstate_halt(); | 120 | sstate_halt(); |
122 | if (prom_palette) | 121 | if (prom_palette) |
123 | prom_palette (1); | 122 | prom_palette (1); |
124 | if (prom_keyboard) | ||
125 | prom_keyboard(); | ||
126 | prom_halt(); | 123 | prom_halt(); |
127 | panic("Halt failed!"); | 124 | panic("Halt failed!"); |
128 | } | 125 | } |
@@ -132,8 +129,6 @@ void machine_alt_power_off(void) | |||
132 | sstate_poweroff(); | 129 | sstate_poweroff(); |
133 | if (prom_palette) | 130 | if (prom_palette) |
134 | prom_palette(1); | 131 | prom_palette(1); |
135 | if (prom_keyboard) | ||
136 | prom_keyboard(); | ||
137 | prom_halt_power_off(); | 132 | prom_halt_power_off(); |
138 | panic("Power-off failed!"); | 133 | panic("Power-off failed!"); |
139 | } | 134 | } |
@@ -147,8 +142,6 @@ void machine_restart(char * cmd) | |||
147 | if (p) *p = 0; | 142 | if (p) *p = 0; |
148 | if (prom_palette) | 143 | if (prom_palette) |
149 | prom_palette (1); | 144 | prom_palette (1); |
150 | if (prom_keyboard) | ||
151 | prom_keyboard(); | ||
152 | if (cmd) | 145 | if (cmd) |
153 | prom_reboot(cmd); | 146 | prom_reboot(cmd); |
154 | if (*reboot_command) | 147 | if (*reboot_command) |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 82b4d091e4f4..577c823b0529 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -69,7 +69,6 @@ struct screen_info screen_info = { | |||
69 | }; | 69 | }; |
70 | 70 | ||
71 | void (*prom_palette)(int); | 71 | void (*prom_palette)(int); |
72 | void (*prom_keyboard)(void); | ||
73 | 72 | ||
74 | static void | 73 | static void |
75 | prom_console_write(struct console *con, const char *s, unsigned n) | 74 | prom_console_write(struct console *con, const char *s, unsigned n) |