diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-08-19 12:49:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-08-19 12:49:29 +0000 |
| commit | fe655729813463e2e73d377749e05803fbce6acd (patch) | |
| tree | a642e2dc47a0e44ebf0404620060767490d9fb05 /target/linux/generic | |
| parent | 48c7c56dcbf25797b0b278846f1c6ff409161cd9 (diff) | |
| download | upstream-fe655729813463e2e73d377749e05803fbce6acd.tar.gz upstream-fe655729813463e2e73d377749e05803fbce6acd.tar.bz2 upstream-fe655729813463e2e73d377749e05803fbce6acd.zip | |
kernel: backport ssb dma_dev changes to fix b43 build
SVN-Revision: 22718
Diffstat (limited to 'target/linux/generic')
| -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 0000000000..9251e28739 --- /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; |