diff options
-rw-r--r-- | arch/arm/common/it8152.c | 8 | ||||
-rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index 7974baacafce..6c0913562455 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c | |||
@@ -263,14 +263,6 @@ static int it8152_pci_platform_notify_remove(struct device *dev) | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) | ||
267 | { | ||
268 | dev_dbg(dev, "%s: dma_addr %08x, size %08x\n", | ||
269 | __func__, dma_addr, size); | ||
270 | return (dev->bus == &pci_bus_type) && | ||
271 | ((dma_addr + size - PHYS_OFFSET) >= SZ_64M); | ||
272 | } | ||
273 | |||
274 | int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) | 266 | int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) |
275 | { | 267 | { |
276 | it8152_io.start = IT8152_IO_BASE + 0x12000; | 268 | it8152_io.start = IT8152_IO_BASE + 0x12000; |
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 69ce0727edb5..b5ccc6a993d5 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
@@ -298,7 +298,15 @@ extern void dmabounce_unregister_dev(struct device *); | |||
298 | * DMA access and 1 if the buffer needs to be bounced. | 298 | * DMA access and 1 if the buffer needs to be bounced. |
299 | * | 299 | * |
300 | */ | 300 | */ |
301 | #ifdef CONFIG_SA1111 | ||
301 | extern int dma_needs_bounce(struct device*, dma_addr_t, size_t); | 302 | extern int dma_needs_bounce(struct device*, dma_addr_t, size_t); |
303 | #else | ||
304 | static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr, | ||
305 | size_t size) | ||
306 | { | ||
307 | return 0; | ||
308 | } | ||
309 | #endif | ||
302 | 310 | ||
303 | /* | 311 | /* |
304 | * The DMA API, implemented by dmabounce.c. See below for descriptions. | 312 | * The DMA API, implemented by dmabounce.c. See below for descriptions. |