Commit 70417c15 authored by Valdis Kletnieks's avatar Valdis Kletnieks Committed by Linus Torvalds

[PATCH] #ifdef cleanup for PPC

Another few #if/#ifdef cleanups, this time for the PPC architecture.

Signed-off-by: <valdis.kletnieks@vt.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e489f7cc
...@@ -661,7 +661,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) ...@@ -661,7 +661,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
++count; ++count;
sp = *(unsigned long *)sp; sp = *(unsigned long *)sp;
} }
#if !CONFIG_KALLSYMS #ifndef CONFIG_KALLSYMS
if (count > 0) if (count > 0)
printk("\n"); printk("\n");
#endif #endif
......
...@@ -307,7 +307,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn) ...@@ -307,7 +307,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
{ {
if (bus == 0 && PCI_SLOT(devfn) == 0) if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
#if CONFIG_85xx_PCI2 #ifdef CONFIG_85xx_PCI2
/* With the current code we know PCI2 will be bus 2, however this may /* With the current code we know PCI2 will be bus 2, however this may
* not be guarnteed */ * not be guarnteed */
if (bus == 2 && PCI_SLOT(devfn) == 0) if (bus == 2 && PCI_SLOT(devfn) == 0)
......
...@@ -277,7 +277,7 @@ mpc85xx_setup_hose(void) ...@@ -277,7 +277,7 @@ mpc85xx_setup_hose(void)
hose_a->io_space.start = MPC85XX_PCI1_LOWER_IO; hose_a->io_space.start = MPC85XX_PCI1_LOWER_IO;
hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO; hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO;
hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE; hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE;
#if CONFIG_85xx_PCI2 #ifdef CONFIG_85xx_PCI2
isa_io_base = isa_io_base =
(unsigned long) ioremap(MPC85XX_PCI1_IO_BASE, (unsigned long) ioremap(MPC85XX_PCI1_IO_BASE,
MPC85XX_PCI1_IO_SIZE + MPC85XX_PCI1_IO_SIZE +
...@@ -304,7 +304,7 @@ mpc85xx_setup_hose(void) ...@@ -304,7 +304,7 @@ mpc85xx_setup_hose(void)
hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno); hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno);
#if CONFIG_85xx_PCI2 #ifdef CONFIG_85xx_PCI2
hose_b = pcibios_alloc_controller(); hose_b = pcibios_alloc_controller();
if (!hose_b) if (!hose_b)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment