From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.25]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (Client CN "smtp.osdl.org", Issuer "OSDL Hostmaster" (not verified)) by ozlabs.org (Postfix) with ESMTP id 0CC7867C4A for ; Thu, 23 Nov 2006 11:10:49 +1100 (EST) Message-Id: <200611230010.kAN0AX57020905@shell0.pdx.osdl.net> Subject: - ppc4xx-compilation-fixes-for-pci-less-configs.patch removed from -mm tree To: wojtekka@toxygen.net, benh@kernel.crashing.org, linuxppc-dev@ozlabs.org, paulus@samba.org, mm-commits@vger.kernel.org From: akpm@osdl.org Date: Wed, 22 Nov 2006 16:10:33 -0800 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , The patch titled ppc4xx: Compilation fixes for PCI-less configs has been removed from the -mm tree. Its filename was ppc4xx-compilation-fixes-for-pci-less-configs.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: ppc4xx: Compilation fixes for PCI-less configs From: Wojtek Kaniewski 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: Wojtek Kaniewski Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Signed-off-by: Andrew Morton --- arch/ppc/platforms/4xx/bubinga.c | 2 ++ arch/ppc/platforms/4xx/cpci405.c | 2 ++ arch/ppc/platforms/4xx/ep405.c | 2 ++ 3 files changed, 6 insertions(+) diff -puN arch/ppc/platforms/4xx/bubinga.c~ppc4xx-compilation-fixes-for-pci-less-configs arch/ppc/platforms/4xx/bubinga.c --- a/arch/ppc/platforms/4xx/bubinga.c~ppc4xx-compilation-fixes-for-pci-less-configs +++ a/arch/ppc/platforms/4xx/bubinga.c @@ -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; /* @@ -212,6 +213,7 @@ bios_fixup(struct pci_controller *hose, printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la))); #endif +#endif } void __init diff -puN arch/ppc/platforms/4xx/cpci405.c~ppc4xx-compilation-fixes-for-pci-less-configs arch/ppc/platforms/4xx/cpci405.c --- a/arch/ppc/platforms/4xx/cpci405.c~ppc4xx-compilation-fixes-for-pci-less-configs +++ a/arch/ppc/platforms/4xx/cpci405.c @@ -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, PCI_FUNC(hose->first_busno), bar, &bar_response); } +#endif } void __init diff -puN arch/ppc/platforms/4xx/ep405.c~ppc4xx-compilation-fixes-for-pci-less-configs arch/ppc/platforms/4xx/ep405.c --- a/arch/ppc/platforms/4xx/ep405.c~ppc4xx-compilation-fixes-for-pci-less-configs +++ a/arch/ppc/platforms/4xx/ep405.c @@ -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, PCI_FUNC(hose->first_busno), bar, bar_response); } /* end work arround */ +#endif } void __init _ Patches currently in -mm which might be from wojtekka@toxygen.net are git-powerpc.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-ppc-fix.patch