From patchwork Mon Dec 8 04:53:25 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 12677 X-Patchwork-Delegate: jwboyer@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id C37C9DDF16 for ; Mon, 8 Dec 2008 15:54:31 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: by ozlabs.org (Postfix, from userid 1030) id 0CE03DDE0E; Mon, 8 Dec 2008 15:54:11 +1100 (EST) To: Josh Boyer From: Benjamin Herrenschmidt Date: Mon, 08 Dec 2008 15:53:25 +1100 Subject: [PATCH] powerpc: Fix build of 4xx simple platforms without CONFIG_PCI Message-Id: <20081208045411.0CE03DDE0E@ozlabs.org> Cc: linuxppc-dev@ozlabs.org X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org The global ppc_pci_flags is not defined when CONFIG_PCI is not set, causing a link error Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/platforms/40x/ppc40x_simple.c | 2 ++ arch/powerpc/platforms/44x/ppc44x_simple.c | 2 ++ 2 files changed, 4 insertions(+) --- linux-work.orig/arch/powerpc/platforms/40x/ppc40x_simple.c 2008-12-08 15:51:49.000000000 +1100 +++ linux-work/arch/powerpc/platforms/40x/ppc40x_simple.c 2008-12-08 15:51:52.000000000 +1100 @@ -61,7 +61,9 @@ static int __init ppc40x_probe(void) for (i = 0; i < ARRAY_SIZE(board); i++) { if (of_flat_dt_is_compatible(root, board[i])) { +#ifdef CONFIG_PCI ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; +#endif return 1; } } Index: linux-work/arch/powerpc/platforms/44x/ppc44x_simple.c =================================================================== --- linux-work.orig/arch/powerpc/platforms/44x/ppc44x_simple.c 2008-12-08 15:51:31.000000000 +1100 +++ linux-work/arch/powerpc/platforms/44x/ppc44x_simple.c 2008-12-08 15:51:39.000000000 +1100 @@ -70,7 +70,9 @@ static int __init ppc44x_probe(void) for (i = 0; i < ARRAY_SIZE(board); i++) { if (of_flat_dt_is_compatible(root, board[i])) { +#ifdef CONFIG_PCI ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; +#endif return 1; } }