Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d30593e authored by Wojtek Kaniewski's avatar Wojtek Kaniewski Committed by Paul Mackerras
Browse files

[POWERPC] Compilation fixes for ppc4xx PCI-less configs 



Fix compilation without PCI support for Bubinga, CPCI405 and EP405.
bios_fixup() for these boards uses functions available only with
CONFIG_PCI, so linker fails.

Signed-off-by: default avatarWojtek Kaniewski <wojtekka@toxygen.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d6a0005c

arch/ppc/platforms/4xx/bubinga.c

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ bubinga_early_serial_map(void) 
void __init

bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)

{

#ifdef CONFIG_PCI



	unsigned int bar_response, bar;

	/*
@@ -211,6 +212,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) 
	printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));

	printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));



#endif

#endif

}

arch/ppc/platforms/4xx/cpci405.c

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ cpci405_setup_arch(void) 
void __init

bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)

{

#ifdef CONFIG_PCI

	unsigned int bar_response, bar;



	/* Disable region first */
@@ -167,6 +168,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) 
					PCI_FUNC(hose->first_busno), bar,

					&bar_response);

	}

#endif

}



void __init

arch/ppc/platforms/4xx/ep405.c

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ ep405_setup_arch(void) 
void __init

bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)

{

#ifdef CONFIG_PCI

	unsigned int bar_response, bar;

	/*

	 * Expected PCI mapping:
@@ -130,6 +131,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip) 
		    PCI_FUNC(hose->first_busno), bar, bar_response);

	}

	/* end work arround */

#endif

}



void __init