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
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
pplus.c
diff --git
a/arch/ppc/platforms/pplus.c
b/arch/ppc/platforms/pplus.c
index
6fc3ca9
..
7922346
100644
(file)
--- a/
arch/ppc/platforms/pplus.c
+++ b/
arch/ppc/platforms/pplus.c
@@
-48,8
+48,6
@@
TODC_ALLOC();
TODC_ALLOC();
-extern char saved_command_line[];
-
extern void pplus_setup_hose(void);
extern void pplus_set_VIA_IDE_native(void);
extern void pplus_setup_hose(void);
extern void pplus_set_VIA_IDE_native(void);
@@
-585,8
+583,6
@@
static void __init pplus_setup_arch(void)
vgacon_remap_base = (unsigned long)ioremap(PPLUS_ISA_MEM_BASE,
0x08000000);
conswitchp = &vga_con;
vgacon_remap_base = (unsigned long)ioremap(PPLUS_ISA_MEM_BASE,
0x08000000);
conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
- conswitchp = &dummy_con;
#endif
#ifdef CONFIG_PPCBUG_NVRAM
/* Read in NVRAM data */
#endif
#ifdef CONFIG_PPCBUG_NVRAM
/* Read in NVRAM data */