diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-07-01 22:28:22 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-07-01 22:28:22 +0000 |
| commit | b81b30cef718ce12ae193b0cf7b33ebfddb23e0d (patch) | |
| tree | 73fdeae8bced61751ad8daee55e365d357fb680e /target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch | |
| parent | a757dd969eccb012ba4a5d3a47efecb33ce34f39 (diff) | |
| download | master-187ad058-b81b30cef718ce12ae193b0cf7b33ebfddb23e0d.tar.gz master-187ad058-b81b30cef718ce12ae193b0cf7b33ebfddb23e0d.tar.bz2 master-187ad058-b81b30cef718ce12ae193b0cf7b33ebfddb23e0d.zip | |
[kernel] refresh 2.6.34 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22042 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch b/target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch index b207c094c6..fd463b4a75 100644 --- a/target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch +++ b/target/linux/generic/patches-2.6.34/976-ssb_add_dma_dev.patch @@ -21,9 +21,8 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> include/linux/ssb/ssb.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -diff -puN drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure drivers/ssb/main.c ---- a/drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure -+++ a/drivers/ssb/main.c +--- a/drivers/ssb/main.c ++++ b/drivers/ssb/main.c @@ -486,6 +486,7 @@ static int ssb_devices_register(struct s #ifdef CONFIG_SSB_PCIHOST sdev->irq = bus->host_pci->irq; @@ -40,9 +39,8 @@ diff -puN drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure drivers/ssb break; } -diff -puN include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure include/linux/ssb/ssb.h ---- a/include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure -+++ a/include/linux/ssb/ssb.h +--- 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; @@ -52,8 +50,3 @@ diff -puN include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure includ struct ssb_bus *bus; struct ssb_device_id id; -_ --- -To unsubscribe from this list: send the line "unsubscribe linux-wireless" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html |