diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
commit | c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef (patch) | |
tree | 1386b9352b7b78bf1cb985463ab3aea30cb4288c /arch/arm/mach-sa1100/include/mach/hardware.h | |
parent | dfee09c8acf18e84fe197bb5d821d1e4e02d020f (diff) | |
parent | ef4669db0c9d5f06d5fd169fa461289723a93a91 (diff) |
Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/hardware.h')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/hardware.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h index 967ae768439..99f5856d8de 100644 --- a/arch/arm/mach-sa1100/include/mach/hardware.h +++ b/arch/arm/mach-sa1100/include/mach/hardware.h @@ -76,12 +76,4 @@ static inline unsigned long get_clock_tick_rate(void) #include "SA-1101.h" #endif -#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_PCI) -#define PCIBIOS_MIN_IO 0 -#define PCIBIOS_MIN_MEM 0 -#define pcibios_assign_all_busses() 1 -#define HAVE_ARCH_PCI_SET_DMA_MASK 1 -#endif - - #endif /* _ASM_ARCH_HARDWARE_H */ |