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 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
maple
/
setup.c
diff --git
a/arch/powerpc/platforms/maple/setup.c
b/arch/powerpc/platforms/maple/setup.c
index
24c0aef
..
5cf90c2
100644
(file)
--- a/
arch/powerpc/platforms/maple/setup.c
+++ b/
arch/powerpc/platforms/maple/setup.c
@@
-13,7
+13,6
@@
#define DEBUG
#define DEBUG
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
@@
-189,7
+188,7
@@
void __init maple_setup_arch(void)
conswitchp = &dummy_con;
#endif
conswitchp = &dummy_con;
#endif
- printk(KERN_
INFO
"Using native/NAP idle loop\n");
+ printk(KERN_
DEBUG
"Using native/NAP idle loop\n");
}
/*
}
/*
@@
-199,11
+198,6
@@
static void __init maple_init_early(void)
{
DBG(" -> maple_init_early\n");
{
DBG(" -> maple_init_early\n");
- /* Initialize hash table, from now on, we can take hash faults
- * and call ioremap
- */
- hpte_init_native();
-
/* Setup interrupt mapping options */
ppc64_interrupt_controller = IC_OPEN_PIC;
/* Setup interrupt mapping options */
ppc64_interrupt_controller = IC_OPEN_PIC;
@@
-272,6
+266,8
@@
static int __init maple_probe(void)
*/
alloc_dart_table();
*/
alloc_dart_table();
+ hpte_init_native();
+
return 1;
}
return 1;
}