diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
commit | d944e45d6535953d8fa3349e5230a6eecb7e9ecb (patch) | |
tree | af668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch | |
parent | 49fec54fecdd0290325dbf1c29f30781ede28b8e (diff) | |
download | upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.gz upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.bz2 upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.zip |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch b/target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch index f8a247b907..90dfa8b56d 100644 --- a/target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch +++ b/target/linux/lantiq/patches-3.2/0046-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch @@ -12,11 +12,9 @@ Cc: linux-watchdog@vger.kernel.org drivers/watchdog/lantiq_wdt.c | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) -diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c -index da2b09f..40c9eb7 100644 --- a/drivers/watchdog/lantiq_wdt.c +++ b/drivers/watchdog/lantiq_wdt.c -@@ -182,7 +182,7 @@ static struct miscdevice ltq_wdt_miscdev = { +@@ -182,7 +182,7 @@ static struct miscdevice ltq_wdt_miscdev .fops = <q_wdt_fops, }; @@ -25,7 +23,7 @@ index da2b09f..40c9eb7 100644 ltq_wdt_probe(struct platform_device *pdev) { struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -@@ -230,6 +230,7 @@ ltq_wdt_remove(struct platform_device *pdev) +@@ -230,6 +230,7 @@ ltq_wdt_remove(struct platform_device *p static struct platform_driver ltq_wdt_driver = { @@ -33,7 +31,7 @@ index da2b09f..40c9eb7 100644 .remove = __devexit_p(ltq_wdt_remove), .driver = { .name = "ltq_wdt", -@@ -237,21 +238,7 @@ static struct platform_driver ltq_wdt_driver = { +@@ -237,21 +238,7 @@ static struct platform_driver ltq_wdt_dr }, }; @@ -56,6 +54,3 @@ index da2b09f..40c9eb7 100644 module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); --- -1.7.7.1 - |