diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-06 16:39:23 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-06 16:39:23 +0100 |
| commit | f444a57ca10fa7c199f1daf1cebd1fd329004992 (patch) | |
| tree | 6bc4fabcd547f21d59535313368666cba692377a /arch | |
| parent | ARM: 6524/1: GIC irq desciptor bug fix (diff) | |
| parent | ARM: cns3xxx: Fix build with CONFIG_PCI=y (diff) | |
| download | linux-f444a57ca10fa7c199f1daf1cebd1fd329004992.tar.xz linux-f444a57ca10fa7c199f1daf1cebd1fd329004992.zip | |
Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx
Diffstat (limited to 'arch')
| -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++) { |