diff options
Diffstat (limited to 'arch/arm/mach-pxa/include/mach')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/clkdev.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/include/mach/clkdev.h b/arch/arm/mach-pxa/include/mach/clkdev.h deleted file mode 100644 index 04b37a89801c..000000000000 --- a/arch/arm/mach-pxa/include/mach/clkdev.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef __ASM_MACH_CLKDEV_H | ||
2 | #define __ASM_MACH_CLKDEV_H | ||
3 | |||
4 | #define __clk_get(clk) ({ 1; }) | ||
5 | #define __clk_put(clk) do { } while (0) | ||
6 | |||
7 | #endif | ||
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 6957ba56025b..de63ca3016b4 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h | |||
@@ -337,9 +337,6 @@ extern unsigned long get_clock_tick_rate(void); | |||
337 | #endif | 337 | #endif |
338 | 338 | ||
339 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) | 339 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) |
340 | #define PCIBIOS_MIN_IO 0 | ||
341 | #define PCIBIOS_MIN_MEM 0 | ||
342 | #define pcibios_assign_all_busses() 1 | ||
343 | #define ARCH_HAS_DMA_SET_COHERENT_MASK | 340 | #define ARCH_HAS_DMA_SET_COHERENT_MASK |
344 | #endif | 341 | #endif |
345 | 342 | ||