lkml.org 
[lkml]   [2008]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2] [WATCHDOG] mpc8xxx_wdt: fix modular build
    This patch fixes following build error when mpc8xxx_wdt is selected to
    build as a module:

    drivers/watchdog/mpc8xxx_wdt.c:304: error: redefinition of '__inittest'
    drivers/watchdog/mpc8xxx_wdt.c:298: error: previous definition of '__inittest' was here
    drivers/watchdog/mpc8xxx_wdt.c:304: error: redefinition of 'init_module'
    drivers/watchdog/mpc8xxx_wdt.c:298: error: previous definition of 'init_module' was here

    Reported-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    ---

    CONFIG_8xxx_WDT_MODULE -> MODULE, per Adrian Bunk's comment.

    drivers/watchdog/mpc8xxx_wdt.c | 11 ++++++++++-
    1 files changed, 10 insertions(+), 1 deletions(-)

    diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
    index f209496..8e50bc4 100644
    --- a/drivers/watchdog/mpc8xxx_wdt.c
    +++ b/drivers/watchdog/mpc8xxx_wdt.c
    @@ -48,6 +48,7 @@ struct mpc8xxx_wdt_type {
    };

    static struct mpc8xxx_wdt __iomem *wd_base;
    +static int mpc8xxx_wdt_init_late(void);

    static u16 timeout = 0xffff;
    module_param(timeout, ushort, 0);
    @@ -213,6 +214,12 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev,
    else
    timeout_sec = timeout / freq;

    +#ifdef MODULE
    + ret = mpc8xxx_wdt_init_late();
    + if (ret)
    + goto err_unmap;
    +#endif
    +
    pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d "
    "(%d seconds)\n", reset ? "reset" : "interrupt", timeout,
    timeout_sec);
    @@ -280,7 +287,7 @@ static struct of_platform_driver mpc8xxx_wdt_driver = {
    * very early to start pinging the watchdog (misc devices are not yet
    * available), and later module_init() just registers the misc device.
    */
    -static int __init mpc8xxx_wdt_init_late(void)
    +static int mpc8xxx_wdt_init_late(void)
    {
    int ret;

    @@ -295,7 +302,9 @@ static int __init mpc8xxx_wdt_init_late(void)
    }
    return 0;
    }
    +#ifndef MODULE
    module_init(mpc8xxx_wdt_init_late);
    +#endif

    static int __init mpc8xxx_wdt_init(void)
    {
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2008-08-13 20:37    [W:0.022 / U:0.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site