diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/mach-iop13xx | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
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 6d5a90813d31..773ea0c95b9f 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) | |||
| 987 | iop13xx_atux_setup(); | 987 | iop13xx_atux_setup(); |
| 988 | } | 988 | } |
| 989 | 989 | ||
| 990 | hook_fault_code(16+6, iop13xx_pci_abort, SIGBUS, | 990 | hook_fault_code(16+6, iop13xx_pci_abort, SIGBUS, 0, |
| 991 | "imprecise external abort"); | 991 | "imprecise external abort"); |
| 992 | } | 992 | } |
| 993 | 993 | ||