qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

kernel: update ssb and bcma to linux-next next-20110628

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27299 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke
2011-06-28 19:33:50 +00:00
parent e2e4e12a9a
commit 6936562161
6 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/generic/patches-3.0/025-bcma_backport.patch
View File

@@ -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;
}