git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
m68k
/
hp300
/
config.c
diff --git
a/arch/m68k/hp300/config.c
b/arch/m68k/hp300/config.c
index
a0b854f
..
6d129ee
100644
(file)
--- a/
arch/m68k/hp300/config.c
+++ b/
arch/m68k/hp300/config.c
@@
-260,9
+260,6
@@
void __init config_hp300(void)
mach_reset = hp300_reset;
#ifdef CONFIG_HEARTBEAT
mach_heartbeat = hp300_pulse;
mach_reset = hp300_reset;
#ifdef CONFIG_HEARTBEAT
mach_heartbeat = hp300_pulse;
-#endif
-#ifdef CONFIG_DUMMY_CONSOLE
- conswitchp = &dummy_con;
#endif
mach_max_dma_address = 0xffffffff;
#endif
mach_max_dma_address = 0xffffffff;