Changeset 25774


Ignore:
Timestamp:
2011-02-27T21:40:10+01:00 (7 years ago)
Author:
mb
Message:

n810bm: Compile fix for kernel with lock debugging

File:
1 edited

Legend:

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

    r25746 r25774  
    11Index: linux-2.6.38-rc6/drivers/cbus/Kconfig 
    22=================================================================== 
    3 --- linux-2.6.38-rc6.orig/drivers/cbus/Kconfig  2011-02-26 23:22:54.941732609 +0100 
    4 +++ linux-2.6.38-rc6/drivers/cbus/Kconfig       2011-02-26 23:25:39.886753420 +0100 
     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 
    55@@ -72,4 +72,12 @@ 
    66          to Retu/Vilma. Detection state and events are exposed through 
     
    1818Index: linux-2.6.38-rc6/drivers/cbus/Makefile 
    1919=================================================================== 
    20 --- linux-2.6.38-rc6.orig/drivers/cbus/Makefile 2011-02-26 23:22:54.927732361 +0100 
    21 +++ linux-2.6.38-rc6/drivers/cbus/Makefile      2011-02-26 23:25:39.886753420 +0100 
     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 
    2222@@ -11,3 +11,6 @@ 
    2323 obj-$(CONFIG_CBUS_RETU_RTC)    += retu-rtc.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-26 23:25:39.889753477 +0100 
     32+++ linux-2.6.38-rc6/drivers/cbus/n810bm_main.c 2011-02-27 01:05:20.245990032 +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-26 23:25:39.889753477 +0100 
     1634+++ linux-2.6.38-rc6/drivers/cbus/lipocharge.c  2011-02-27 01:05:20.246990058 +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-26 23:25:39.890753496 +0100 
     1822+++ linux-2.6.38-rc6/drivers/cbus/lipocharge.h  2011-02-27 01:05:20.246990058 +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-26 23:22:54.992733511 +0100 
    1887 +++ linux-2.6.38-rc6/drivers/cbus/cbus.c        2011-02-26 23:25:39.890753496 +0100 
     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 
    18881888@@ -35,6 +35,7 @@ 
    18891889 #include <linux/platform_device.h> 
     
    19101910Index: linux-2.6.38-rc6/drivers/cbus/cbus.h 
    19111911=================================================================== 
    1912 --- linux-2.6.38-rc6.orig/drivers/cbus/cbus.h   2011-02-26 23:22:54.975733211 +0100 
    1913 +++ linux-2.6.38-rc6/drivers/cbus/cbus.h        2011-02-26 23:25:39.891753515 +0100 
     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 
    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-26 23:25:18.905358127 +0100 
    1924 +++ linux-2.6.38-rc6/drivers/cbus/retu.c        2011-02-26 23:25:39.891753515 +0100 
     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 
    19251925@@ -423,6 +423,11 @@ 
    19261926        if (!child) 
     
    19371937Index: linux-2.6.38-rc6/drivers/cbus/tahvo.c 
    19381938=================================================================== 
    1939 --- linux-2.6.38-rc6.orig/drivers/cbus/tahvo.c  2011-02-26 23:22:54.894731777 +0100 
    1940 +++ linux-2.6.38-rc6/drivers/cbus/tahvo.c       2011-02-26 23:25:39.891753515 +0100 
    1941 @@ -115,6 +115,7 @@ 
     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 @@ 
     1942  
     1943 static struct tasklet_struct tahvo_tasklet; 
     1944 spinlock_t tahvo_lock = SPIN_LOCK_UNLOCKED; 
     1945+EXPORT_SYMBOL(tahvo_lock); 
     1946  
     1947 struct tahvo_irq_handler_desc { 
     1948        int (*func)(unsigned long); 
     1949@@ -115,6 +116,7 @@ 
    19421950        tahvo_write_reg(reg, w); 
    19431951        spin_unlock_irqrestore(&tahvo_lock, flags); 
Note: See TracChangeset for help on using the changeset viewer.