diff options
author | Linus Torvalds | 2011-07-27 02:12:10 +0200 |
---|---|---|
committer | Linus Torvalds | 2011-07-27 02:12:10 +0200 |
commit | 3960ef326a1838971466193ffa008ff37c1d978d (patch) | |
tree | 282b74377bccb9fa79639ce4df2dcb48652dbdec /arch/arm/mach-shark/include/mach | |
parent | Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
parent | Merge branch 'cross-platform/clkdev' into next/cross-platform (diff) | |
download | kernel-qcow2-linux-3960ef326a1838971466193ffa008ff37c1d978d.tar.gz kernel-qcow2-linux-3960ef326a1838971466193ffa008ff37c1d978d.tar.xz kernel-qcow2-linux-3960ef326a1838971466193ffa008ff37c1d978d.zip |
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-shark/include/mach')
-rw-r--r-- | arch/arm/mach-shark/include/mach/hardware.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index 94d84b27a0cb..663f952a8ab3 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h @@ -12,11 +12,5 @@ #define UNCACHEABLE_ADDR 0xdf010000 -#define pcibios_assign_all_busses() 1 - -#define PCIBIOS_MIN_IO 0x6000 -#define PCIBIOS_MIN_MEM 0x50000000 -#define PCIMEM_BASE 0xe8000000 - #endif |