mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'linux-2.6'
This commit is contained in:
commit
8423200553
387 changed files with 3091 additions and 2537 deletions
|
|
@ -37,9 +37,9 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,
|
|||
*/
|
||||
|
||||
#define __dma_alloc_coherent(gfp, size, handle) NULL
|
||||
#define __dma_free_coherent(size, addr) do { } while (0)
|
||||
#define __dma_sync(addr, size, rw) do { } while (0)
|
||||
#define __dma_sync_page(pg, off, sz, rw) do { } while (0)
|
||||
#define __dma_free_coherent(size, addr) ((void)0)
|
||||
#define __dma_sync(addr, size, rw) ((void)0)
|
||||
#define __dma_sync_page(pg, off, sz, rw) ((void)0)
|
||||
|
||||
#endif /* ! CONFIG_NOT_COHERENT_CACHE */
|
||||
|
||||
|
|
@ -251,7 +251,7 @@ dma_map_single(struct device *dev, void *ptr, size_t size,
|
|||
}
|
||||
|
||||
/* We do nothing. */
|
||||
#define dma_unmap_single(dev, addr, size, dir) do { } while (0)
|
||||
#define dma_unmap_single(dev, addr, size, dir) ((void)0)
|
||||
|
||||
static inline dma_addr_t
|
||||
dma_map_page(struct device *dev, struct page *page,
|
||||
|
|
@ -266,7 +266,7 @@ dma_map_page(struct device *dev, struct page *page,
|
|||
}
|
||||
|
||||
/* We do nothing. */
|
||||
#define dma_unmap_page(dev, handle, size, dir) do { } while (0)
|
||||
#define dma_unmap_page(dev, handle, size, dir) ((void)0)
|
||||
|
||||
static inline int
|
||||
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
||||
|
|
@ -286,7 +286,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
|||
}
|
||||
|
||||
/* We don't do anything here. */
|
||||
#define dma_unmap_sg(dev, sg, nents, dir) do { } while (0)
|
||||
#define dma_unmap_sg(dev, sg, nents, dir) ((void)0)
|
||||
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
|
|
|
|||
12
include/asm-powerpc/libata-portmap.h
Normal file
12
include/asm-powerpc/libata-portmap.h
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
#ifndef __ASM_POWERPC_LIBATA_PORTMAP_H
|
||||
#define __ASM_POWERPC_LIBATA_PORTMAP_H
|
||||
|
||||
#define ATA_PRIMARY_CMD 0x1F0
|
||||
#define ATA_PRIMARY_CTL 0x3F6
|
||||
#define ATA_PRIMARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 0)
|
||||
|
||||
#define ATA_SECONDARY_CMD 0x170
|
||||
#define ATA_SECONDARY_CTL 0x376
|
||||
#define ATA_SECONDARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 1)
|
||||
|
||||
#endif
|
||||
Loading…
Reference in a new issue