diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:12:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:12:10 -0400 |
commit | 3960ef326a1838971466193ffa008ff37c1d978d (patch) | |
tree | 282b74377bccb9fa79639ce4df2dcb48652dbdec /arch/arm/mach-cns3xxx/pcie.c | |
parent | 62c9072bee2272232d0ed92dc8148c48c1f10f8e (diff) | |
parent | c8f85523e70f8202ff49858bacd72fa65245f382 (diff) |
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
ARM: Consolidate the clkdev header files
ARM: set vga memory base at run-time
ARM: convert PCI defines to variables
ARM: pci: make pcibios_assign_all_busses use pci_has_flag
ARM: remove unnecessary mach/hardware.h includes
pci: move microblaze and powerpc pci flag functions into asm-generic
powerpc: rename ppc_pci_*_flags to pci_*_flags
Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
Diffstat (limited to 'arch/arm/mach-cns3xxx/pcie.c')
-rw-r--r-- | arch/arm/mach-cns3xxx/pcie.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c index 78defd71a82..a4ec080908b 100644 --- a/arch/arm/mach-cns3xxx/pcie.c +++ b/arch/arm/mach-cns3xxx/pcie.c | |||
@@ -369,6 +369,9 @@ static int __init cns3xxx_pcie_init(void) | |||
369 | { | 369 | { |
370 | int i; | 370 | int i; |
371 | 371 | ||
372 | pcibios_min_io = 0; | ||
373 | pcibios_min_mem = 0; | ||
374 | |||
372 | hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0, | 375 | hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0, |
373 | "imprecise external abort"); | 376 | "imprecise external abort"); |
374 | 377 | ||