From bcb479b3521303e754c6dcef673527eed447c34f Mon Sep 17 00:00:00 2001 From: mb Date: Sun, 30 Oct 2011 18:46:45 +0000 Subject: omap24xx: Fix n810 boot git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28683 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.1/900-n810-battery-management.patch | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch') diff --git a/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch b/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch index 3d90ebd76..65cbe5042 100644 --- a/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch +++ b/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch @@ -1,7 +1,7 @@ Index: linux-3.1/drivers/cbus/Kconfig =================================================================== ---- linux-3.1.orig/drivers/cbus/Kconfig 2011-10-30 00:48:42.989047642 +0200 -+++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 00:48:58.765036552 +0200 +--- linux-3.1.orig/drivers/cbus/Kconfig 2011-10-30 19:14:57.000000000 +0100 ++++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 19:32:58.263510754 +0100 @@ -83,4 +83,12 @@ config CBUS_RETU_HEADSET endif # CBUS_RETU @@ -17,8 +17,8 @@ Index: linux-3.1/drivers/cbus/Kconfig endmenu Index: linux-3.1/drivers/cbus/Makefile =================================================================== ---- linux-3.1.orig/drivers/cbus/Makefile 2011-10-30 00:48:42.989047642 +0200 -+++ linux-3.1/drivers/cbus/Makefile 2011-10-30 00:48:58.765036552 +0200 +--- linux-3.1.orig/drivers/cbus/Makefile 2011-10-30 19:14:57.000000000 +0100 ++++ linux-3.1/drivers/cbus/Makefile 2011-10-30 19:32:58.263510754 +0100 @@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.o @@ -29,7 +29,7 @@ Index: linux-3.1/drivers/cbus/Makefile Index: linux-3.1/drivers/cbus/n810bm_main.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1/drivers/cbus/n810bm_main.c 2011-10-30 00:48:58.765036552 +0200 ++++ linux-3.1/drivers/cbus/n810bm_main.c 2011-10-30 19:32:58.263510754 +0100 @@ -0,0 +1,1586 @@ +/* + * Nokia n810 battery management @@ -1620,7 +1620,7 @@ Index: linux-3.1/drivers/cbus/n810bm_main.c Index: linux-3.1/drivers/cbus/lipocharge.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1/drivers/cbus/lipocharge.c 2011-10-30 00:48:58.765036552 +0200 ++++ linux-3.1/drivers/cbus/lipocharge.c 2011-10-30 19:32:58.263510754 +0100 @@ -0,0 +1,183 @@ +/* + * Generic LIPO battery charger @@ -1808,7 +1808,7 @@ Index: linux-3.1/drivers/cbus/lipocharge.c Index: linux-3.1/drivers/cbus/lipocharge.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1/drivers/cbus/lipocharge.h 2011-10-30 00:48:58.765036552 +0200 ++++ linux-3.1/drivers/cbus/lipocharge.h 2011-10-30 19:32:58.263510754 +0100 @@ -0,0 +1,60 @@ +#ifndef LIPOCHARGE_H_ +#define LIPOCHARGE_H_ @@ -1872,12 +1872,12 @@ Index: linux-3.1/drivers/cbus/lipocharge.h +#endif /* LIPOCHARGE_H_ */ Index: linux-3.1/drivers/cbus/cbus.c =================================================================== ---- linux-3.1.orig/drivers/cbus/cbus.c 2011-10-30 00:48:46.413045272 +0200 -+++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 00:48:58.765036552 +0200 +--- linux-3.1.orig/drivers/cbus/cbus.c 2011-10-30 19:31:35.000000000 +0100 ++++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 19:33:12.107254808 +0100 @@ -34,6 +34,7 @@ #include #include - #include + #include +#include #include "cbus.h" @@ -1898,8 +1898,8 @@ Index: linux-3.1/drivers/cbus/cbus.c MODULE_AUTHOR("Juha Yrjölä"); Index: linux-3.1/drivers/cbus/cbus.h =================================================================== ---- linux-3.1.orig/drivers/cbus/cbus.h 2011-10-30 00:48:42.989047642 +0200 -+++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 00:48:58.765036552 +0200 +--- linux-3.1.orig/drivers/cbus/cbus.h 2011-10-30 19:14:57.000000000 +0100 ++++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 19:32:58.263510754 +0100 @@ -27,4 +27,6 @@ extern int cbus_read_reg(struct device * extern int cbus_write_reg(struct device *, unsigned dev, unsigned reg, unsigned val); @@ -1909,8 +1909,8 @@ Index: linux-3.1/drivers/cbus/cbus.h #endif /* __DRIVERS_CBUS_CBUS_H */ Index: linux-3.1/drivers/cbus/retu.c =================================================================== ---- linux-3.1.orig/drivers/cbus/retu.c 2011-10-30 00:48:46.413045272 +0200 -+++ linux-3.1/drivers/cbus/retu.c 2011-10-30 00:48:58.765036552 +0200 +--- linux-3.1.orig/drivers/cbus/retu.c 2011-10-30 19:31:35.000000000 +0100 ++++ linux-3.1/drivers/cbus/retu.c 2011-10-30 19:32:58.263510754 +0100 @@ -417,6 +417,11 @@ static int retu_allocate_children(struct if (!child) return -ENOMEM; @@ -1925,8 +1925,8 @@ Index: linux-3.1/drivers/cbus/retu.c Index: linux-3.1/drivers/cbus/tahvo.c =================================================================== ---- linux-3.1.orig/drivers/cbus/tahvo.c 2011-10-30 00:48:46.413045272 +0200 -+++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 00:48:58.765036552 +0200 +--- linux-3.1.orig/drivers/cbus/tahvo.c 2011-10-30 19:31:35.000000000 +0100 ++++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 19:32:58.263510754 +0100 @@ -129,6 +129,7 @@ void tahvo_set_clear_reg_bits(struct dev __tahvo_write_reg(tahvo, reg, w); mutex_unlock(&tahvo->mutex); -- cgit v1.2.3