git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
setup_32.c
diff --git
a/arch/sparc/kernel/setup_32.c
b/arch/sparc/kernel/setup_32.c
index
b22ce61
..
648f216
100644
(file)
--- a/
arch/sparc/kernel/setup_32.c
+++ b/
arch/sparc/kernel/setup_32.c
@@
-185,7
+185,6
@@
static void __init boot_flags_init(char *commands)
extern void sun4c_probe_vac(void);
extern char cputypval;
extern void sun4c_probe_vac(void);
extern char cputypval;
-extern unsigned long start, end;
extern unsigned short root_flags;
extern unsigned short root_dev;
extern unsigned short root_flags;
extern unsigned short root_dev;
@@
-210,7
+209,7
@@
void __init setup_arch(char **cmdline_p)
int i;
unsigned long highest_paddr;
int i;
unsigned long highest_paddr;
- sparc_ttable = (struct tt_entry *) &
start
;
+ sparc_ttable = (struct tt_entry *) &
trapbase
;
/* Initialize PROM console and command line. */
*cmdline_p = prom_getbootargs();
/* Initialize PROM console and command line. */
*cmdline_p = prom_getbootargs();