diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-28 19:33:50 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-28 19:33:50 +0000 |
| commit | 6936562161eb76de44dc0a8dc1017fcad3db49ba (patch) | |
| tree | b345303c2a5308a662f10f8e4b7c7108d624795d /target/linux/generic/patches-2.6.39/025-bcma_backport.patch | |
| parent | e2e4e12a9a8ca41c0f9d79d1d9c634406b316c20 (diff) | |
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-2.6.39/025-bcma_backport.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/025-bcma_backport.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch index 333a3b57b..07b278e8c 100644 --- a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch +++ b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch @@ -916,7 +916,7 @@ +} --- /dev/null +++ b/drivers/bcma/main.c -@@ -0,0 +1,254 @@ +@@ -0,0 +1,255 @@ +/* + * Broadcom specific AMBA + * Bus subsystem @@ -926,6 +926,7 @@ + +#include "bcma_private.h" +#include <linux/bcma/bcma.h> ++#include <linux/slab.h> + +MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); +MODULE_LICENSE("GPL"); |