summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2010-11-29 16:46:22 +0100
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-11-29 17:19:15 +0100
commit44266416f786514ec43a0d15ad951c34566b99c9 (patch)
tree65377cecd33737052b712102caaa35fa2acb461c /arch
parentLinux 2.6.37-rc3 (diff)
downloadlinux-44266416f786514ec43a0d15ad951c34566b99c9.tar.xz
linux-44266416f786514ec43a0d15ad951c34566b99c9.zip
ARM: cns3xxx: Fix build with CONFIG_PCI=y
commit 6338a6aa7c082f11d55712251e14178c68bf5869 ("ARM: 6269/1: Add 'code' parameter for hook_fault_code()") breaks CNS3xxx build: CC arch/arm/mach-cns3xxx/pcie.o pcie.c: In function 'cns3xxx_pcie_init': pcie.c:373: warning: passing argument 4 of 'hook_fault_code' makes integer from pointer without a cast pcie.c:373: error: too few arguments to function 'hook_fault_code' This commit fixes the small issue. Cc: stable@kernel.org [36] Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-cns3xxx/pcie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 38088c36936c..78defd71a829 100644
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -369,7 +369,7 @@ static int __init cns3xxx_pcie_init(void)
{
int i;
- hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS,
+ hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0,
"imprecise external abort");
for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) {