diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-06 10:39:23 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-06 10:39:23 -0500 |
| commit | f444a57ca10fa7c199f1daf1cebd1fd329004992 (patch) | |
| tree | 6bc4fabcd547f21d59535313368666cba692377a /arch/arm | |
| parent | 87507500b7fc3620e467abb617a3452f0cccc72d (diff) | |
| parent | 44266416f786514ec43a0d15ad951c34566b99c9 (diff) | |
Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx
Diffstat (limited to 'arch/arm')
| -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) | |||
| 369 | { | 369 | { |
| 370 | int i; | 370 | int i; |
| 371 | 371 | ||
| 372 | hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, | 372 | hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0, |
| 373 | "imprecise external abort"); | 373 | "imprecise external abort"); |
| 374 | 374 | ||
| 375 | for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) { | 375 | for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) { |