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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.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
..
ec5c1e1
100644
(file)
--- a/
arch/powerpc/platforms/maple/setup.c
+++ b/
arch/powerpc/platforms/maple/setup.c
@@
-259,10
+259,9
@@
static void __init maple_progress(char *s, unsigned short hex)
/*
* Called very early, MMU is off, device-tree isn't unflattened
*/
/*
* Called very early, MMU is off, device-tree isn't unflattened
*/
-static int __init maple_probe(
void
)
+static int __init maple_probe(
int platform
)
{
{
- unsigned long root = of_get_flat_dt_root();
- if (!of_flat_dt_is_compatible(root, "Momentum,Maple"))
+ if (platform != PLATFORM_MAPLE)
return 0;
/*
* On U3, the DART (iommu) must be allocated now since it
return 0;
/*
* On U3, the DART (iommu) must be allocated now since it
@@
-275,8
+274,7
@@
static int __init maple_probe(void)
return 1;
}
return 1;
}
-define_machine(maple_md) {
- .name = "Maple",
+struct machdep_calls __initdata maple_md = {
.probe = maple_probe,
.setup_arch = maple_setup_arch,
.init_early = maple_init_early,
.probe = maple_probe,
.setup_arch = maple_setup_arch,
.init_early = maple_init_early,
@@
-292,7
+290,7
@@
define_machine(maple_md) {
.get_rtc_time = maple_get_rtc_time,
.calibrate_decr = generic_calibrate_decr,
.progress = maple_progress,
.get_rtc_time = maple_get_rtc_time,
.calibrate_decr = generic_calibrate_decr,
.progress = maple_progress,
- .
power_save = power4
_idle,
+ .
idle_loop = native
_idle,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,