kernel: backport ssb dma_dev changes to fix b43 build

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22718 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-19 12:49:29 +00:00 · 2010-08-19 12:49:29 +00:00 · c5274566fd
parent e1f64f7fda
commit c5274566fd
1 changed files with 29 additions and 0 deletions
--- a/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch
+++ b/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch
@ -0,0 +1,29 @@
+--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
+@@ -461,6 +461,7 @@
+ #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:
+@@ -473,6 +474,7 @@
+ 			break;
+ 		case SSB_BUSTYPE_SSB:
+ 			dev->dma_mask = &dev->coherent_dma_mask;
+			sdev->dma_dev = dev;
+ 			break;
+ 		}
+ 
+--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
+@@ -167,7 +167,7 @@
+ 	 * 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;