diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /arch/arm/mach-cns3xxx/pcie.c | |
parent | c451278c2864e253a4bb303b596a29edc3bb527c (diff) | |
parent | 5d190c40100793a6dfc37bf325677c10f3c80edf (diff) | |
download | talos-op-linux-67b738ef32df7ec429004866d2a739a3775894d2.tar.gz talos-op-linux-67b738ef32df7ec429004866d2a739a3775894d2.zip |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-cns3xxx/pcie.c')
-rw-r--r-- | arch/arm/mach-cns3xxx/pcie.c | 2 |
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++) { |