kernel: update linux 3.3 to 3.3.2

[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.3 / 0042-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch

diff --git a/target/linux/lantiq/patches-3.3/0042-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch b/target/linux/lantiq/patches-3.3/0042-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch
index 07cf338f80fda57bf23709d60652fe3ae276341d..3d4d61ee40e2a3df50095232ef1141fe066ed4ba 100644 (file)
--- a/target/linux/lantiq/patches-3.3/0042-WDT-MIPS-lantiq-use-module_platform_driver-inside-la.patch
+++ b/target/linux/lantiq/patches-3.3/0042-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(-)
 
  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 fa4866b..70127b3 100644

 --- a/drivers/watchdog/lantiq_wdt.c
 +++ b/drivers/watchdog/lantiq_wdt.c
 --- 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   = &ltq_wdt_fops,
  };
  
        .fops   = &ltq_wdt_fops,
  };
  


@@ -25,7 +23,7 @@ index fa4866b..70127b3 100644
  ltq_wdt_probe(struct platform_device *pdev)
  {
        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  ltq_wdt_probe(struct platform_device *pdev)
  {
        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

-@@ -227,6 +227,7 @@ ltq_wdt_remove(struct platform_device *pdev)
+@@ -227,6 +227,7 @@ ltq_wdt_remove(struct platform_device *p

  
  
  static struct platform_driver ltq_wdt_driver = {
  
  
  static struct platform_driver ltq_wdt_driver = {


@@ -33,7 +31,7 @@ index fa4866b..70127b3 100644
        .remove = __devexit_p(ltq_wdt_remove),
        .driver = {
                .name = "ltq_wdt",
        .remove = __devexit_p(ltq_wdt_remove),
        .driver = {
                .name = "ltq_wdt",

-@@ -234,21 +235,7 @@ static struct platform_driver ltq_wdt_driver = {
+@@ -234,21 +235,7 @@ static struct platform_driver ltq_wdt_dr

        },
  };
  
        },
  };
  


@@ -56,6 +54,3 @@ index fa4866b..70127b3 100644
  module_param(nowayout, int, 0);
  MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
  
  module_param(nowayout, int, 0);
  MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
  

--- 
-1.7.9.1
-