aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-06-14 15:47:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-06-14 15:47:06 +0000
commit50bf15dd262a4e60503222b0cd9dcfb3cd55d749 (patch)
treee1184b56b5f3fa650314cc116488a3e98995f9e8 /target/linux
parent3a270cbf6f51655115f4ed8dd7437e2ca5e82c84 (diff)
downloadupstream-50bf15dd262a4e60503222b0cd9dcfb3cd55d749.tar.gz
upstream-50bf15dd262a4e60503222b0cd9dcfb3cd55d749.tar.bz2
upstream-50bf15dd262a4e60503222b0cd9dcfb3cd55d749.zip
backport the ssb dma device change to 2.6.30 as well
SVN-Revision: 21798
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch b/target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch
new file mode 100644
index 0000000000..6b57e876cf
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -465,6 +465,7 @@ static int ssb_devices_register(struct s
+ #ifdef CONFIG_SSB_PCIHOST
+ sdev->irq = bus->host_pci->irq;
+ dev->parent = &bus->host_pci->dev;
++ sdev->dma_dev = dev->parent;
+ #endif
+ break;
+ case SSB_BUSTYPE_PCMCIA:
+@@ -475,6 +476,7 @@ static int ssb_devices_register(struct s
+ break;
+ case SSB_BUSTYPE_SSB:
+ dev->dma_mask = &dev->coherent_dma_mask;
++ sdev->dma_dev = dev;
+ break;
+ default:
+ break;
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -167,7 +167,7 @@ struct ssb_device {
+ * is an optimization. */
+ const struct ssb_bus_ops *ops;
+
+- struct device *dev;
++ struct device *dev, *dma_dev;
+
+ struct ssb_bus *bus;
+ struct ssb_device_id id;