aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch)
treeb35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch
parenta899dbd4e32835b0a1d917479d10e5a2744c273c (diff)
downloadmaster-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz
master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2
master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch')
-rw-r--r--target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch10
1 files changed, 0 insertions, 10 deletions
diff --git a/target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch b/target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch
index 320589a827..0311e69978 100644
--- a/target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch
+++ b/target/linux/brcm2708/patches-3.14/0033-dmaengine-Add-support-for-BCM2708.patch
@@ -14,8 +14,6 @@ Signed-off-by: Florian Meier <florian.meier@koalo.de>
3 files changed, 595 insertions(+)
create mode 100644 drivers/dma/bcm2708-dmaengine.c
-diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
-index 605b016..edd5842 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -312,6 +312,12 @@ config DMA_BCM2835
@@ -31,8 +29,6 @@ index 605b016..edd5842 100644
config TI_CPPI41
tristate "AM33xx CPPI41 DMA support"
depends on ARCH_OMAP
-diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
-index a029d0f4..f4d9516 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
@@ -43,9 +39,6 @@ index a029d0f4..f4d9516 100644
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o
obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o
obj-$(CONFIG_TI_CPPI41) += cppi41.o
-diff --git a/drivers/dma/bcm2708-dmaengine.c b/drivers/dma/bcm2708-dmaengine.c
-new file mode 100644
-index 0000000..b244293
--- /dev/null
+++ b/drivers/dma/bcm2708-dmaengine.c
@@ -0,0 +1,588 @@
@@ -637,6 +630,3 @@ index 0000000..b244293
+MODULE_DESCRIPTION("BCM2708 DMA engine driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
---
-1.9.1
-