diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-28 19:33:50 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-28 19:33:50 +0000 |
| commit | 2af4f6f634492487a02685e2ad4184b98d574572 (patch) | |
| tree | e05afc7c9c7ad33cb4b5a12700eda8cdcbb4b198 /target/linux/generic/patches-2.6.39/025-bcma_backport.patch | |
| parent | c5821c1a3a94060be1c38315bfdf122aee5567c1 (diff) | |
| download | upstream-2af4f6f634492487a02685e2ad4184b98d574572.tar.gz upstream-2af4f6f634492487a02685e2ad4184b98d574572.tar.bz2 upstream-2af4f6f634492487a02685e2ad4184b98d574572.zip | |
kernel: update ssb and bcma to linux-next next-20110628
SVN-Revision: 27299
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 333a3b57b0..07b278e8c7 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"); |