diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/mach-iop13xx | |
parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
download | kernel_samsung_crespo-ceb0885d3b01bb2e2f18765770e212914f2864be.zip kernel_samsung_crespo-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.gz kernel_samsung_crespo-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.bz2 |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c index 6d5a908..773ea0c 100644 --- a/arch/arm/mach-iop13xx/pci.c +++ b/arch/arm/mach-iop13xx/pci.c @@ -987,7 +987,7 @@ void __init iop13xx_pci_init(void) iop13xx_atux_setup(); } - hook_fault_code(16+6, iop13xx_pci_abort, SIGBUS, + hook_fault_code(16+6, iop13xx_pci_abort, SIGBUS, 0, "imprecise external abort"); } |