diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-19 12:49:29 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-19 12:49:29 +0000 |
| commit | e3fc173c6bdf06e38d9b6c472c04a02dc8f3171e (patch) | |
| tree | 5993ef6fed37db02893f65bac3343bc30cfe4128 /target | |
| parent | 3b1766320d5057f81d3fc719cc62c522e42baf9b (diff) | |
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
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git 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 new file mode 100644 index 000000000..9251e2873 --- /dev/null +++ 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; |