Sekhar Nori
be5bce2bf5
net: davinci emac: use dma_{map, unmap}_single API for cache coherency ...
The davinci emac driver uses some ARM specific DMA APIs
for cache coherency which have been removed from kernel
with the 2.6.34 merge.
Modify the driver to use the dma_{map, unmap}_single() APIs
defined in dma-mapping.h
Without this fix, the driver fails to compile on Linus's
tree.
Tested on DM365 and OMAP-L138 EVMs.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-03-15 15:46:59 -07:00
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-03-01 10:36:22 -08:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2010-03-01 13:04:58 -08:00
PM: Allow device drivers to use dpm_wait()
2010-02-26 20:39:11 +01:00
Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block
2010-03-01 09:00:29 -08:00
Bluetooth: Convert Marvell driver to use per adapter debugfs
2010-02-27 14:05:38 +01:00
block: Consolidate phys_segment and hw_segment limits
2010-02-26 13:58:08 +01:00
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
2010-03-02 10:34:25 -08:00
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-03-01 08:48:25 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2010-02-26 16:50:02 -08:00
Merge branch 'sh/stable-updates'
2010-02-15 14:49:37 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2010-02-11 14:07:13 -08:00
block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors
2010-02-26 13:58:08 +01:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2010-02-28 19:23:06 -08:00
Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-02-28 10:59:18 -08:00
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
2010-02-25 17:39:16 +01:00
Merge commit 'origin/master' into next
2010-02-17 10:00:42 +11:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-03-01 09:15:15 -08:00
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-03-01 10:36:22 -08:00
block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors
2010-02-26 13:58:08 +01:00
ipoib: returned back addrlen check for mc addresses
2010-02-28 01:34:28 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-03-01 10:38:09 -08:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2010-02-28 19:23:06 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-03-01 10:38:09 -08:00
block: Consolidate phys_segment and hw_segment limits
2010-02-26 13:58:08 +01:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2010-02-28 19:23:06 -08:00
block: Consolidate phys_segment and hw_segment limits
2010-02-26 13:58:08 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-03-02 07:55:08 -08:00
Merge with mainline to remove plat-omap/Kconfig conflict
2010-03-01 14:19:05 -08:00
Merge with mainline to remove plat-omap/Kconfig conflict
2010-03-01 14:19:05 -08:00
Merge with mainline to remove plat-omap/Kconfig conflict
2010-03-01 14:19:05 -08:00
net: davinci emac: use dma_{map, unmap}_single API for cache coherency
2010-03-15 15:46:59 -07:00
of: move definition of of_chosen into common code.
2010-02-14 07:13:55 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-03-02 07:55:08 -08:00
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
2010-02-27 16:19:22 -08:00
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-03-01 10:36:22 -08:00
powerpc: Remove trailing space in messages
2010-02-09 13:56:23 +11:00
regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
2010-02-12 11:39:49 +00:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-03-01 09:15:15 -08:00
qeth: change checksumming default for HiperSockets
2010-03-10 07:32:26 -08:00
Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block
2010-03-01 09:00:29 -08:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-03-01 09:15:15 -08:00
sh: Use dummy_irq_chip for INTC redirect vectors.
2010-02-17 12:37:42 +09:00
Merge with mainline to remove plat-omap/Kconfig conflict
2010-03-01 14:19:05 -08:00
ssb: Add PCI ID 0x4322 to PHU handling
2010-02-19 15:52:51 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-03-02 07:55:08 -08:00
Merge with mainline to remove plat-omap/Kconfig conflict
2010-03-01 14:19:05 -08:00
vhost-net: restart tx poll on sk_sndbuf full
2010-02-28 19:50:33 +02:00
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
2010-03-02 10:41:26 -08:00
virtio: fix out of range array access
2010-02-28 20:39:11 +02:00
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
2010-02-15 09:27:02 -08:00
Merge with mainline to remove plat-omap/Kconfig conflict
2010-03-01 14:19:05 -08:00
be5bce2bf5