From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Neuling Subject: [PATCH] powerpc: fix usage of setup_pci_atmu() Date: Mon, 15 Apr 2013 15:42:01 +1000 Message-ID: <5881.1366004521@ale.ozlabs.ibm.com> References: <1363201636-7318-1-git-send-email-galak@kernel.crashing.org> Return-path: Received: from ozlabs.org ([203.10.76.45]:54030 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750739Ab3DOFmF (ORCPT ); Mon, 15 Apr 2013 01:42:05 -0400 In-reply-to: <1363201636-7318-1-git-send-email-galak@kernel.crashing.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Kumar Gala , sfr@canb.auug.org.au Cc: linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org, benh@kernel.crashing.org Linux next is currently failing to compile mpc85xx_defconfig with: arch/powerpc/sysdev/fsl_pci.c:944:2: error: too many arguments to function 'setup_pci_atmu' This is caused by (from Kumar's next branch): commit 34642bbb3d12121333efcf4ea7dfe66685e403a1 Author: Kumar Gala powerpc/fsl-pci: Keep PCI SoC controller registers in pci_controller Which changed definition of setup_pci_atmu() but didn't update one of the callers. Below fixes this. Signed-off-by: Michael Neuling --- Kumar: this is for your next tree diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 83918c3..a10a036 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -941,7 +941,7 @@ static int fsl_pci_resume(struct device *dev) return -ENODEV; } - setup_pci_atmu(hose, &pci_rsrc); + setup_pci_atmu(hose); return 0; }