diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/sparc/kernel/setup_32.c | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/sparc/kernel/setup_32.c')
| -rw-r--r-- | arch/sparc/kernel/setup_32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 16a47ffe03c1..9be2af55c5cd 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c | |||
| @@ -268,8 +268,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 268 | 268 | ||
| 269 | #ifdef CONFIG_DUMMY_CONSOLE | 269 | #ifdef CONFIG_DUMMY_CONSOLE |
| 270 | conswitchp = &dummy_con; | 270 | conswitchp = &dummy_con; |
| 271 | #elif defined(CONFIG_PROM_CONSOLE) | ||
| 272 | conswitchp = &prom_con; | ||
| 273 | #endif | 271 | #endif |
| 274 | boot_flags_init(*cmdline_p); | 272 | boot_flags_init(*cmdline_p); |
| 275 | 273 | ||