summaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-2.6.35
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-09 18:43:43 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-09 18:43:43 +0000
commitc3dc10c95d7833d6dcd131d183803fb0cbe7e3ac (patch)
tree6f3e604c1cbd47e1bf80bb73a1e5a62796a17305 /target/linux/omap24xx/patches-2.6.35
parent704225036a301757b0b02130e10b2cbdca9d9fed (diff)
omap24xx: Update kernel config. This also fixes module loading.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-2.6.35')
-rw-r--r--target/linux/omap24xx/patches-2.6.35/500-cbus.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/omap24xx/patches-2.6.35/500-cbus.patch b/target/linux/omap24xx/patches-2.6.35/500-cbus.patch
index 04ab3d2a8..e490974ea 100644
--- a/target/linux/omap24xx/patches-2.6.35/500-cbus.patch
+++ b/target/linux/omap24xx/patches-2.6.35/500-cbus.patch
@@ -5,7 +5,7 @@
drivers/cbus/Makefile | 14
drivers/cbus/cbus.c | 309 ++++++++++++++++
drivers/cbus/cbus.h | 36 +
- drivers/cbus/retu-headset.c | 355 ++++++++++++++++++
+ drivers/cbus/retu-headset.c | 356 ++++++++++++++++++
drivers/cbus/retu-pwrbutton.c | 118 ++++++
drivers/cbus/retu-rtc.c | 477 +++++++++++++++++++++++++
drivers/cbus/retu-user.c | 425 ++++++++++++++++++++++
@@ -17,7 +17,7 @@
drivers/cbus/tahvo.c | 443 +++++++++++++++++++++++
drivers/cbus/tahvo.h | 61 +++
drivers/cbus/user_retu_tahvo.h | 75 +++
- 18 files changed, 4524 insertions(+), 1 deletion(-)
+ 18 files changed, 4525 insertions(+), 1 deletion(-)
--- /dev/null
+++ linux-2.6.35/drivers/cbus/cbus.c
@@ -1032,7 +1032,7 @@
+#endif /* __DRIVERS_CBUS_RETU_H */
--- /dev/null
+++ linux-2.6.35/drivers/cbus/retu-headset.c
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,356 @@
+/**
+ * Retu/Vilma headset detection
+ *
@@ -1060,6 +1060,7 @@
+#include <linux/delay.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
++#include <linux/slab.h>
+
+#include "retu.h"
+