diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-28 19:33:50 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-28 19:33:50 +0000 |
commit | 99204249696129389ffa13f854ff7d2f9aeeca12 (patch) | |
tree | b345303c2a5308a662f10f8e4b7c7108d624795d /target/linux/generic/patches-3.0/025-bcma_backport.patch | |
parent | 210af3e57c9ed52f0b9c84e27eb9554da302b428 (diff) | |
download | master-187ad058-99204249696129389ffa13f854ff7d2f9aeeca12.tar.gz master-187ad058-99204249696129389ffa13f854ff7d2f9aeeca12.tar.bz2 master-187ad058-99204249696129389ffa13f854ff7d2f9aeeca12.zip |
kernel: update ssb and bcma to linux-next next-20110628
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27299 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/025-bcma_backport.patch')
-rw-r--r-- | target/linux/generic/patches-3.0/025-bcma_backport.patch | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.0/025-bcma_backport.patch b/target/linux/generic/patches-3.0/025-bcma_backport.patch index 8f02d9e80b..1e61794701 100644 --- a/target/linux/generic/patches-3.0/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.0/025-bcma_backport.patch @@ -200,7 +200,15 @@ }; --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -89,6 +89,8 @@ static int bcma_register_cores(struct bc +@@ -7,6 +7,7 @@ + + #include "bcma_private.h" + #include <linux/bcma/bcma.h> ++#include <linux/slab.h> + + MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); + MODULE_LICENSE("GPL"); +@@ -89,6 +90,8 @@ static int bcma_register_cores(struct bc switch (bus->hosttype) { case BCMA_HOSTTYPE_PCI: core->dev.parent = &bus->host_pci->dev; @@ -209,7 +217,7 @@ break; case BCMA_HOSTTYPE_NONE: case BCMA_HOSTTYPE_SDIO: -@@ -144,6 +146,13 @@ int bcma_bus_register(struct bcma_bus *b +@@ -144,6 +147,13 @@ int bcma_bus_register(struct bcma_bus *b bcma_core_pci_init(&bus->drv_pci); } @@ -223,7 +231,7 @@ /* Register found cores */ bcma_register_cores(bus); -@@ -151,13 +160,11 @@ int bcma_bus_register(struct bcma_bus *b +@@ -151,13 +161,11 @@ int bcma_bus_register(struct bcma_bus *b return 0; } |