lkml.org 
[lkml]   [2009]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 025/114] WATCHDOG: rc32434_wdt: fix sections
    2.6.28-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Phil Sutter <n0-1@freewrt.org>

    commit d9a8798c4bab5ccd40e45e011f668099cfb3eb83 upstream.

    Fix init and exit sections.

    Signed-off-by: Phil Sutter <n0-1@freewrt.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/watchdog/rc32434_wdt.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/watchdog/rc32434_wdt.c
    +++ b/drivers/watchdog/rc32434_wdt.c
    @@ -34,7 +34,7 @@
    #include <asm/time.h>
    #include <asm/mach-rc32434/integ.h>

    -#define VERSION "0.3"
    +#define VERSION "0.4"

    static struct {
    unsigned long inuse;
    @@ -242,10 +242,10 @@ static struct miscdevice rc32434_wdt_mis
    .fops = &rc32434_wdt_fops,
    };

    -static char banner[] = KERN_INFO KBUILD_MODNAME
    +static char banner[] __devinitdata = KERN_INFO KBUILD_MODNAME
    ": Watchdog Timer version " VERSION ", timer margin: %d sec\n";

    -static int rc32434_wdt_probe(struct platform_device *pdev)
    +static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
    {
    int ret;
    struct resource *r;
    @@ -280,7 +280,7 @@ unmap:
    return ret;
    }

    -static int rc32434_wdt_remove(struct platform_device *pdev)
    +static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
    {
    misc_deregister(&rc32434_wdt_miscdev);
    iounmap(wdt_reg);
    @@ -289,8 +289,8 @@ static int rc32434_wdt_remove(struct pla

    static struct platform_driver rc32434_wdt = {
    .probe = rc32434_wdt_probe,
    - .remove = rc32434_wdt_remove,
    - .driver = {
    + .remove = __devexit_p(rc32434_wdt_remove),
    + .driver = {
    .name = "rc32434_wdt",
    }
    };



    \
     
     \ /
      Last update: 2009-03-14 02:31    [W:4.211 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site