diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-03-13 17:24:28 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-03-13 17:24:28 +0000 |
| commit | a08bd03fadb1950c149a03978e3abab7786cdcc5 (patch) | |
| tree | d132bce1c3f9806b0a41939f3a32452fe6f57886 /target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch | |
| parent | 4226f1d373a75f19beb8deb7b4ef912e5e8ef134 (diff) | |
| download | master-31e0f0ae-a08bd03fadb1950c149a03978e3abab7786cdcc5.tar.gz master-31e0f0ae-a08bd03fadb1950c149a03978e3abab7786cdcc5.tar.bz2 master-31e0f0ae-a08bd03fadb1950c149a03978e3abab7786cdcc5.zip | |
ssb: update ssb to version from linux-next-20110311
SVN-Revision: 26127
Diffstat (limited to 'target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch | 29 |
1 files changed, 0 insertions, 29 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 deleted file mode 100644 index 9251e28739..0000000000 --- a/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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; |