omap24xx: Improve n810 battery management

[openwrt/staging/yousong.git] / target / linux / omap24xx / patches-2.6.36 / 500-cbus.patch

diff --git a/target/linux/omap24xx/patches-2.6.36/500-cbus.patch b/target/linux/omap24xx/patches-2.6.36/500-cbus.patch
index 91c8ac076bc80eff773e8e7abf93cd3dd47f8877..aba59bc14607cc8b81e539aac07e6de2b8e9ed11 100644 (file)
--- a/target/linux/omap24xx/patches-2.6.36/500-cbus.patch
+++ b/target/linux/omap24xx/patches-2.6.36/500-cbus.patch
@@ -20,7 +20,7 @@
  18 files changed, 4533 insertions(+), 1 deletion(-)
 
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/cbus.c
++++ linux-2.6.36-rc7/drivers/cbus/cbus.c
 @@ -0,0 +1,309 @@
 +/*
 + * drivers/cbus/cbus.c
@@ -332,7 +332,7 @@
 +MODULE_AUTHOR("Mikko Ylinen");
 +
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/cbus.h
++++ linux-2.6.36-rc7/drivers/cbus/cbus.h
 @@ -0,0 +1,36 @@
 +/*
 + * drivers/cbus/cbus.h
@@ -371,7 +371,7 @@
 +
 +#endif /* __DRIVERS_CBUS_CBUS_H */
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/Kconfig
++++ linux-2.6.36-rc7/drivers/cbus/Kconfig
 @@ -0,0 +1,89 @@
 +#
 +# CBUS device configuration
@@ -463,7 +463,7 @@
 +
 +endmenu
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/Makefile
++++ linux-2.6.36-rc7/drivers/cbus/Makefile
 @@ -0,0 +1,14 @@
 +#
 +# Makefile for CBUS.
@@ -480,7 +480,7 @@
 +obj-$(CONFIG_CBUS_RETU_USER)  += retu-user.o
 +obj-$(CONFIG_CBUS_RETU_HEADSET)       += retu-headset.o
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu.c
++++ linux-2.6.36-rc7/drivers/cbus/retu.c
 @@ -0,0 +1,468 @@
 +/**
 + * drivers/cbus/retu.c
@@ -951,7 +951,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu.h
++++ linux-2.6.36-rc7/drivers/cbus/retu.h
 @@ -0,0 +1,77 @@
 +/**
 + * drivers/cbus/retu.h
@@ -1031,7 +1031,7 @@
 +
 +#endif /* __DRIVERS_CBUS_RETU_H */
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu-headset.c
++++ linux-2.6.36-rc7/drivers/cbus/retu-headset.c
 @@ -0,0 +1,356 @@
 +/**
 + * Retu/Vilma headset detection
@@ -1390,7 +1390,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Juha Yrjölä");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu-pwrbutton.c
++++ linux-2.6.36-rc7/drivers/cbus/retu-pwrbutton.c
 @@ -0,0 +1,118 @@
 +/**
 + * drivers/cbus/retu-pwrbutton.c
@@ -1511,7 +1511,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Ari Saastamoinen");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu-rtc.c
++++ linux-2.6.36-rc7/drivers/cbus/retu-rtc.c
 @@ -0,0 +1,477 @@
 +/**
 + * drivers/cbus/retu-rtc.c
@@ -1991,7 +1991,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Paul Mundt and Igor Stoppa");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu-user.c
++++ linux-2.6.36-rc7/drivers/cbus/retu-user.c
 @@ -0,0 +1,424 @@
 +/**
 + * drivers/cbus/retu-user.c
@@ -2418,7 +2418,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Mikko Ylinen");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/retu-wdt.c
++++ linux-2.6.36-rc7/drivers/cbus/retu-wdt.c
 @@ -0,0 +1,387 @@
 +/**
 + * drivers/cbus/retu-wdt.c
@@ -2808,7 +2808,7 @@
 +MODULE_LICENSE("GPL");
 +
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/tahvo.c
++++ linux-2.6.36-rc7/drivers/cbus/tahvo.c
 @@ -0,0 +1,443 @@
 +/**
 + * drivers/cbus/tahvo.c
@@ -3254,7 +3254,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/tahvo.h
++++ linux-2.6.36-rc7/drivers/cbus/tahvo.h
 @@ -0,0 +1,61 @@
 +/*
 + * drivers/cbus/tahvo.h
@@ -3318,7 +3318,7 @@
 +
 +#endif /* __DRIVERS_CBUS_TAHVO_H */
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/tahvo-usb.c
++++ linux-2.6.36-rc7/drivers/cbus/tahvo-usb.c
 @@ -0,0 +1,788 @@
 +/**
 + * drivers/cbus/tahvo-usb.c
@@ -4109,7 +4109,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/tahvo-user.c
++++ linux-2.6.36-rc7/drivers/cbus/tahvo-user.c
 @@ -0,0 +1,406 @@
 +/**
 + * drivers/cbus/tahvo-user.c
@@ -4518,7 +4518,7 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Mikko Ylinen");
 --- /dev/null
-+++ linux-2.6.36-rc4/drivers/cbus/user_retu_tahvo.h
++++ linux-2.6.36-rc7/drivers/cbus/user_retu_tahvo.h
 @@ -0,0 +1,75 @@
 +/**
 + * drivers/cbus/user_retu_tahvo.h
@@ -4595,8 +4595,8 @@
 +};
 +
 +#endif
---- linux-2.6.36-rc4.orig/drivers/Makefile
-+++ linux-2.6.36-rc4/drivers/Makefile
+--- linux-2.6.36-rc7.orig/drivers/Makefile
++++ linux-2.6.36-rc7/drivers/Makefile
 @@ -74,7 +74,7 @@ obj-$(CONFIG_GAMEPORT)               += input/gamepor
  obj-$(CONFIG_INPUT)           += input/
  obj-$(CONFIG_I2O)             += message/
@@ -4606,9 +4606,9 @@
  obj-$(CONFIG_PPS)             += pps/
  obj-$(CONFIG_W1)              += w1/
  obj-$(CONFIG_POWER_SUPPLY)    += power/
---- linux-2.6.36-rc4.orig/arch/arm/Kconfig
-+++ linux-2.6.36-rc4/arch/arm/Kconfig
-@@ -1760,6 +1760,10 @@ source "net/Kconfig"
+--- linux-2.6.36-rc7.orig/arch/arm/Kconfig
++++ linux-2.6.36-rc7/arch/arm/Kconfig
+@@ -1785,6 +1785,10 @@ source "net/Kconfig"
  
  source "drivers/Kconfig"