diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-12-06 19:50:30 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-12-06 19:50:30 +0000 |
| commit | 77eea315ca21e3c56e8062d4511d7a6ef445175c (patch) | |
| tree | 03cce3c90df783bd0ec1e67520647c5b85288f15 /target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch | |
| parent | 4baeaf652ea434c7482925fd6455927c10164e34 (diff) | |
| download | upstream-77eea315ca21e3c56e8062d4511d7a6ef445175c.tar.gz upstream-77eea315ca21e3c56e8062d4511d7a6ef445175c.tar.bz2 upstream-77eea315ca21e3c56e8062d4511d7a6ef445175c.zip | |
linux: update 3.1 to 3.1.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29470 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch')
| -rw-r--r-- | target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 99c174927f..09f14b756b 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 @@ -1881,7 +1881,7 @@ #endif /* __DRIVERS_CBUS_CBUS_H */ --- a/drivers/cbus/retu.c +++ b/drivers/cbus/retu.c -@@ -417,6 +417,11 @@ static int retu_allocate_children(struct +@@ -399,6 +399,11 @@ static int retu_allocate_children(struct if (!child) return -ENOMEM; @@ -1895,7 +1895,7 @@ --- a/drivers/cbus/tahvo.c +++ b/drivers/cbus/tahvo.c -@@ -131,6 +131,7 @@ void tahvo_set_clear_reg_bits(struct dev +@@ -129,6 +129,7 @@ void tahvo_set_clear_reg_bits(struct dev __tahvo_write_reg(tahvo, reg, w); mutex_unlock(&tahvo->mutex); } @@ -1903,7 +1903,7 @@ static irqreturn_t tahvo_irq_handler(int irq, void *_tahvo) { -@@ -307,6 +308,11 @@ static int tahvo_allocate_children(struc +@@ -292,6 +293,11 @@ static int tahvo_allocate_children(struc if (!child) return -ENOMEM; |