projects
/
lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update ssb and bcma to linux-next next-20110628
[lede.git]
/
target
/
linux
/
generic
/
patches-2.6.39
/
025-bcma_backport.patch
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 333a3b57b02543d71ba6def6671c41eaa82afbab..07b278e8c78bc7139b359667b5810280e6cd7999 100644
(file)
--- 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
+}
--- /dev/null
+++ b/drivers/bcma/main.c
-@@ -0,0 +1,25
4
@@
+@@ -0,0 +1,25
5
@@
+/*
+ * Broadcom specific AMBA
+ * Bus subsystem
+/*
+ * Broadcom specific AMBA
+ * Bus subsystem
@@
-926,6
+926,7
@@
+
+#include "bcma_private.h"
+#include <linux/bcma/bcma.h>
+
+#include "bcma_private.h"
+#include <linux/bcma/bcma.h>
++#include <linux/slab.h>
+
+MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
+MODULE_LICENSE("GPL");
+
+MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
+MODULE_LICENSE("GPL");