Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx

f444a57c · Russell King <[email protected]> · 2010-12-06 15:39:23 +00:00

Merge commit. Changes below are compared with the first parent: 87507500.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/arm/mach-cns3xxx/pcie.c	modified	+1	−1	View file

diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 38088c3..78defd7 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++) {