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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
m68k
/
sun3x
/
config.c
diff --git
a/arch/m68k/sun3x/config.c
b/arch/m68k/sun3x/config.c
index
0ef547f
..
756d627
100644
(file)
--- a/
arch/m68k/sun3x/config.c
+++ b/
arch/m68k/sun3x/config.c
@@
-6,7
+6,6
@@
* based on code from Oliver Jowett <oliver@jowett.manawatu.gen.nz>
*/
* based on code from Oliver Jowett <oliver@jowett.manawatu.gen.nz>
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/console.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/console.h>
@@
-71,7
+70,7
@@
void __init config_sun3x(void)
mach_get_model = sun3_get_model;
mach_get_hardware_list = sun3x_get_hardware_list;
mach_get_model = sun3_get_model;
mach_get_hardware_list = sun3x_get_hardware_list;
-#if
def CONFIG_DUMMY_CONSOLE
+#if
defined(CONFIG_DUMMY_CONSOLE)
conswitchp = &dummy_con;
#endif
conswitchp = &dummy_con;
#endif