leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] powerpc: fixing compile issue with !CONFIG_PCI in legacy_serial.c

Browse Source 
Only build in support for ISA and PCI cases if we have enabled CONFIG_ISA
and CONFIG_PCI.  Additionally, isa_bridge is a global so we shouldn't use
it a parameter name since it gets redefined to NULL when !CONFIG_PCI.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Kumar Gala 2006-01-03 16:15:21 -06:00 committed by Paul Mackerras
parent 03929c76f3
commit 017e0fad3e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/kernel/legacy_serial.c
View File

@ -134,8 +134,9 @@ static int __init add_legacy_soc_port(struct device_node *np,
return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags); return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags);
} }
#ifdef CONFIG_ISA
static int __init add_legacy_isa_port(struct device_node *np, static int __init add_legacy_isa_port(struct device_node *np,
struct device_node *isa_bridge) struct device_node *isa_brg)
{ {
u32 *reg; u32 *reg;
char *typep; char *typep;
@ -167,7 +168,9 @@ static int __init add_legacy_isa_port(struct device_node *np,
return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr, NO_IRQ, UPF_BOOT_AUTOCONF); return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr, NO_IRQ, UPF_BOOT_AUTOCONF);
} }
#endif
#ifdef CONFIG_PCI
static int __init add_legacy_pci_port(struct device_node *np, static int __init add_legacy_pci_port(struct device_node *np,
struct device_node *pci_dev) struct device_node *pci_dev)
{ {
@ -233,6 +236,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
*/ */
return add_legacy_port(np, index, iotype, base, addr, NO_IRQ, UPF_BOOT_AUTOCONF); return add_legacy_port(np, index, iotype, base, addr, NO_IRQ, UPF_BOOT_AUTOCONF);
} }
#endif
/* /*
* This is called very early, as part of setup_system() or eventually * This is called very early, as part of setup_system() or eventually
@ -272,6 +276,7 @@ void __init find_legacy_serial_ports(void)
of_node_put(soc); of_node_put(soc);
} }
#ifdef CONFIG_ISA
/* First fill our array with ISA ports */ /* First fill our array with ISA ports */
for (np = NULL; (np = of_find_node_by_type(np, "serial"));) { for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
struct device_node *isa = of_get_parent(np); struct device_node *isa = of_get_parent(np);
@ -282,7 +287,9 @@ void __init find_legacy_serial_ports(void)
} }
of_node_put(isa); of_node_put(isa);
} }
#endif
#ifdef CONFIG_PCI
/* Next, try to locate PCI ports */ /* Next, try to locate PCI ports */
for (np = NULL; (np = of_find_all_nodes(np));) { for (np = NULL; (np = of_find_all_nodes(np));) {
struct device_node *pci, *parent = of_get_parent(np); struct device_node *pci, *parent = of_get_parent(np);
@ -312,6 +319,7 @@ void __init find_legacy_serial_ports(void)
legacy_serial_console = index; legacy_serial_console = index;
of_node_put(parent); of_node_put(parent);
} }
#endif
DBG("legacy_serial_console = %d\n", legacy_serial_console); DBG("legacy_serial_console = %d\n", legacy_serial_console);
@ -375,6 +383,7 @@ static void __init fixup_port_pio(int index,
struct device_node *np, struct device_node *np,
struct plat_serial8250_port *port) struct plat_serial8250_port *port)
{ {
#ifdef CONFIG_PCI
struct pci_controller *hose; struct pci_controller *hose;
DBG("fixup_port_pio(%d)\n", index); DBG("fixup_port_pio(%d)\n", index);
@ -391,6 +400,7 @@ static void __init fixup_port_pio(int index,
index, port->iobase, port->iobase + offset); index, port->iobase, port->iobase + offset);
port->iobase += offset; port->iobase += offset;
} }
#endif
} }
static void __init fixup_port_mmio(int index, static void __init fixup_port_mmio(int index,