diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/52xx/efika.c | 9 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/setup.c | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 10 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 5 |
5 files changed, 0 insertions, 34 deletions
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 4263158b3274..0b1e60a010ba 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c | |||
@@ -197,15 +197,6 @@ static void __init efika_setup_arch(void) | |||
197 | { | 197 | { |
198 | rtas_initialize(); | 198 | rtas_initialize(); |
199 | 199 | ||
200 | #ifdef CONFIG_BLK_DEV_INITRD | ||
201 | initrd_below_start_ok = 1; | ||
202 | |||
203 | if (initrd_start) | ||
204 | ROOT_DEV = Root_RAM0; | ||
205 | else | ||
206 | #endif | ||
207 | ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */ | ||
208 | |||
209 | efika_pcisetup(); | 200 | efika_pcisetup(); |
210 | 201 | ||
211 | #ifdef CONFIG_PM | 202 | #ifdef CONFIG_PM |
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 5343e3844e2a..98e7ef8e6fc6 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c | |||
@@ -171,11 +171,6 @@ static void __init cell_setup_arch(void) | |||
171 | /* init to some ~sane value until calibrate_delay() runs */ | 171 | /* init to some ~sane value until calibrate_delay() runs */ |
172 | loops_per_jiffy = 50000000; | 172 | loops_per_jiffy = 50000000; |
173 | 173 | ||
174 | if (ROOT_DEV == 0) { | ||
175 | printk("No ramdisk, default root is /dev/hda2\n"); | ||
176 | ROOT_DEV = Root_HDA2; | ||
177 | } | ||
178 | |||
179 | /* Find and initialize PCI host bridges */ | 174 | /* Find and initialize PCI host bridges */ |
180 | init_pci_config_tokens(); | 175 | init_pci_config_tokens(); |
181 | find_and_init_phbs(); | 176 | find_and_init_phbs(); |
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c index 0f1dddb81cd2..1769d755eff3 100644 --- a/arch/powerpc/platforms/celleb/setup.c +++ b/arch/powerpc/platforms/celleb/setup.c | |||
@@ -101,11 +101,6 @@ static void __init celleb_setup_arch(void) | |||
101 | /* init to some ~sane value until calibrate_delay() runs */ | 101 | /* init to some ~sane value until calibrate_delay() runs */ |
102 | loops_per_jiffy = 50000000; | 102 | loops_per_jiffy = 50000000; |
103 | 103 | ||
104 | if (ROOT_DEV == 0) { | ||
105 | printk("No ramdisk, default root is /dev/hda2\n"); | ||
106 | ROOT_DEV = Root_HDA2; | ||
107 | } | ||
108 | |||
109 | #ifdef CONFIG_DUMMY_CONSOLE | 104 | #ifdef CONFIG_DUMMY_CONSOLE |
110 | conswitchp = &dummy_con; | 105 | conswitchp = &dummy_con; |
111 | #endif | 106 | #endif |
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index 96498ad7b943..59306261f5b2 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c | |||
@@ -290,16 +290,6 @@ void __init chrp_setup_arch(void) | |||
290 | ppc_md.set_rtc_time = rtas_set_rtc_time; | 290 | ppc_md.set_rtc_time = rtas_set_rtc_time; |
291 | } | 291 | } |
292 | 292 | ||
293 | #ifdef CONFIG_BLK_DEV_INITRD | ||
294 | /* this is fine for chrp */ | ||
295 | initrd_below_start_ok = 1; | ||
296 | |||
297 | if (initrd_start) | ||
298 | ROOT_DEV = Root_RAM0; | ||
299 | else | ||
300 | #endif | ||
301 | ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */ | ||
302 | |||
303 | /* On pegasos, enable the L2 cache if not already done by OF */ | 293 | /* On pegasos, enable the L2 cache if not already done by OF */ |
304 | pegasos_set_l2cr(); | 294 | pegasos_set_l2cr(); |
305 | 295 | ||
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index f0b7146a110f..fdb9b1c8f977 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -257,11 +257,6 @@ static void __init pSeries_setup_arch(void) | |||
257 | /* init to some ~sane value until calibrate_delay() runs */ | 257 | /* init to some ~sane value until calibrate_delay() runs */ |
258 | loops_per_jiffy = 50000000; | 258 | loops_per_jiffy = 50000000; |
259 | 259 | ||
260 | if (ROOT_DEV == 0) { | ||
261 | printk("No ramdisk, default root is /dev/sda2\n"); | ||
262 | ROOT_DEV = Root_SDA2; | ||
263 | } | ||
264 | |||
265 | fwnmi_init(); | 260 | fwnmi_init(); |
266 | 261 | ||
267 | /* Find and initialize PCI host bridges */ | 262 | /* Find and initialize PCI host bridges */ |