diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-07-26 07:19:58 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-07-26 07:19:58 +0000 |
commit | 0a80570a9c0d3ee0ca223e50ce149b1944393f7b (patch) | |
tree | d5cedec9dca6d08d75cd6f3e716c72a67e9d75cf /target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch | |
parent | 0ec41bc74eaedc98a8324bbfa006389e2b8ca22b (diff) | |
download | upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.tar.gz upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.tar.bz2 upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.zip |
kernel: update 3.10 to 3.10.3
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37546 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch')
-rw-r--r-- | target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch b/target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch index 8dfae3a706..dc66b009ef 100644 --- a/target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch +++ b/target/linux/xburst/patches-3.10/007-RTC-JZ4740-Init-the-regulator-register-on-startup.patch @@ -14,8 +14,6 @@ Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> drivers/rtc/rtc-jz4740.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c -index 1e48686..722fb0c 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -14,6 +14,7 @@ @@ -26,7 +24,7 @@ index 1e48686..722fb0c 100644 #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> -@@ -215,6 +216,7 @@ static int jz4740_rtc_probe(struct platform_device *pdev) +@@ -215,6 +216,7 @@ static int jz4740_rtc_probe(struct platf int ret; struct jz4740_rtc *rtc; uint32_t scratchpad; @@ -34,7 +32,7 @@ index 1e48686..722fb0c 100644 rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); if (!rtc) -@@ -280,6 +282,21 @@ static int jz4740_rtc_probe(struct platform_device *pdev) +@@ -280,6 +282,21 @@ static int jz4740_rtc_probe(struct platf } } @@ -56,6 +54,3 @@ index 1e48686..722fb0c 100644 return 0; err_free_irq: --- -1.7.10.4 - |