Changeset 25798


Ignore:
Timestamp:
2011-02-28T21:28:54+01:00 (7 years ago)
Author:
mb
Message:

n810bm: Refresh patch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/omap24xx/patches-2.6.38/900-n810-battery-management.patch

    r25774 r25798  
    11Index: linux-2.6.38-rc6/drivers/cbus/Kconfig 
    22=================================================================== 
    3 --- linux-2.6.38-rc6.orig/drivers/cbus/Kconfig  2011-02-27 00:58:11.730599141 +0100 
    4 +++ linux-2.6.38-rc6/drivers/cbus/Kconfig       2011-02-27 01:05:20.242989951 +0100 
    5 @@ -72,4 +72,12 @@ 
     3--- linux-2.6.38-rc6.orig/drivers/cbus/Kconfig  2011-02-28 15:20:39.590247119 +0100 
     4+++ linux-2.6.38-rc6/drivers/cbus/Kconfig       2011-02-28 15:25:56.106012376 +0100 
     5@@ -72,4 +72,12 @@ config CBUS_RETU_HEADSET 
    66          to Retu/Vilma. Detection state and events are exposed through 
    77          sysfs. 
     
    1818Index: linux-2.6.38-rc6/drivers/cbus/Makefile 
    1919=================================================================== 
    20 --- linux-2.6.38-rc6.orig/drivers/cbus/Makefile 2011-02-27 00:58:11.713598687 +0100 
    21 +++ linux-2.6.38-rc6/drivers/cbus/Makefile      2011-02-27 01:05:20.243989978 +0100 
    22 @@ -11,3 +11,6 @@ 
     20--- linux-2.6.38-rc6.orig/drivers/cbus/Makefile 2011-02-28 15:20:39.574247501 +0100 
     21+++ linux-2.6.38-rc6/drivers/cbus/Makefile      2011-02-28 15:25:56.106012376 +0100 
     22@@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r 
    2323 obj-$(CONFIG_CBUS_RETU_RTC)    += retu-rtc.o 
    2424 obj-$(CONFIG_CBUS_RETU_WDT)    += retu-wdt.o 
     
    3030=================================================================== 
    3131--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    32 +++ linux-2.6.38-rc6/drivers/cbus/n810bm_main.c 2011-02-27 01:05:20.245990032 +0100 
     32+++ linux-2.6.38-rc6/drivers/cbus/n810bm_main.c 2011-02-28 15:25:56.109012160 +0100 
    3333@@ -0,0 +1,1597 @@ 
    3434+/* 
     
    16321632=================================================================== 
    16331633--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    1634 +++ linux-2.6.38-rc6/drivers/cbus/lipocharge.c  2011-02-27 01:05:20.246990058 +0100 
     1634+++ linux-2.6.38-rc6/drivers/cbus/lipocharge.c  2011-02-28 15:25:56.110012088 +0100 
    16351635@@ -0,0 +1,183 @@ 
    16361636+/* 
     
    18201820=================================================================== 
    18211821--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    1822 +++ linux-2.6.38-rc6/drivers/cbus/lipocharge.h  2011-02-27 01:05:20.246990058 +0100 
     1822+++ linux-2.6.38-rc6/drivers/cbus/lipocharge.h  2011-02-28 15:25:56.110012088 +0100 
    18231823@@ -0,0 +1,60 @@ 
    18241824+#ifndef LIPOCHARGE_H_ 
     
    18841884Index: linux-2.6.38-rc6/drivers/cbus/cbus.c 
    18851885=================================================================== 
    1886 --- linux-2.6.38-rc6.orig/drivers/cbus/cbus.c   2011-02-27 00:58:11.781600500 +0100 
    1887 +++ linux-2.6.38-rc6/drivers/cbus/cbus.c        2011-02-27 01:05:20.247990084 +0100 
     1886--- linux-2.6.38-rc6.orig/drivers/cbus/cbus.c   2011-02-28 15:20:39.640245927 +0100 
     1887+++ linux-2.6.38-rc6/drivers/cbus/cbus.c        2011-02-28 15:25:56.110012088 +0100 
    18881888@@ -35,6 +35,7 @@ 
    18891889 #include <linux/platform_device.h> 
     
    18941894 #include "cbus.h" 
    18951895  
    1896 @@ -323,6 +324,13 @@ 
     1896@@ -323,6 +324,13 @@ static void __exit cbus_bus_exit(void) 
    18971897 } 
    18981898 module_exit(cbus_bus_exit); 
     
    19101910Index: linux-2.6.38-rc6/drivers/cbus/cbus.h 
    19111911=================================================================== 
    1912 --- linux-2.6.38-rc6.orig/drivers/cbus/cbus.h   2011-02-27 00:58:11.764600047 +0100 
    1913 +++ linux-2.6.38-rc6/drivers/cbus/cbus.h        2011-02-27 01:05:20.247990084 +0100 
     1912--- linux-2.6.38-rc6.orig/drivers/cbus/cbus.h   2011-02-28 15:20:39.623246332 +0100 
     1913+++ linux-2.6.38-rc6/drivers/cbus/cbus.h        2011-02-28 15:25:56.111012017 +0100 
    19141914@@ -26,4 +26,6 @@ 
    19151915 extern int cbus_read_reg(unsigned dev, unsigned reg); 
     
    19211921Index: linux-2.6.38-rc6/drivers/cbus/retu.c 
    19221922=================================================================== 
    1923 --- linux-2.6.38-rc6.orig/drivers/cbus/retu.c   2011-02-27 00:58:11.748599621 +0100 
    1924 +++ linux-2.6.38-rc6/drivers/cbus/retu.c        2011-02-27 01:05:20.247990084 +0100 
    1925 @@ -423,6 +423,11 @@ 
     1923--- linux-2.6.38-rc6.orig/drivers/cbus/retu.c   2011-02-28 15:22:24.030477769 +0100 
     1924+++ linux-2.6.38-rc6/drivers/cbus/retu.c        2011-02-28 15:25:56.111012017 +0100 
     1925@@ -425,6 +425,11 @@ static int retu_allocate_children(struct 
    19261926        if (!child) 
    19271927                return -ENOMEM; 
     
    19371937Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c 
    19381938=================================================================== 
    1939 --- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.c  2011-02-27 00:58:11.686597968 +0100 
    1940 +++ linux-2.6.38-rc6/drivers/cbus/tahvo.c       2011-02-27 12:17:27.516124940 +0100 
    1941 @@ -54,6 +54,7 @@ 
     1939--- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.c  2011-02-28 15:20:39.547248145 +0100 
     1940+++ linux-2.6.38-rc6/drivers/cbus/tahvo.c       2011-02-28 15:25:56.112011946 +0100 
     1941@@ -54,6 +54,7 @@ static int tahvo_is_betty; 
    19421942  
    19431943 static struct tasklet_struct tahvo_tasklet; 
     
    19471947 struct tahvo_irq_handler_desc { 
    19481948        int (*func)(unsigned long); 
    1949 @@ -115,6 +116,7 @@ 
     1949@@ -115,6 +116,7 @@ void tahvo_set_clear_reg_bits(unsigned r 
    19501950        tahvo_write_reg(reg, w); 
    19511951        spin_unlock_irqrestore(&tahvo_lock, flags); 
Note: See TracChangeset for help on using the changeset viewer.