lkml.org 
[lkml]   [2011]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] tty/serial: atmel_serial: fix compilation
    Date
    If CONFIG_OF is disabled, compilation fails with:

    drivers/tty/serial/atmel_serial.c: In function 'atmel_serial_probe':
    drivers/tty/serial/atmel_serial.c:1788: error: implicit declaration of function 'of_alias_get_id'

    Fix this by adding the proper CONFIG_OF checks.

    Signed-off-by: Sven Schnelle <svens@stackframe.org>
    ---
    drivers/tty/serial/atmel_serial.c | 4 ++++
    1 files changed, 4 insertions(+), 0 deletions(-)

    diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
    index 4a0f86f..de338dd 100644
    --- a/drivers/tty/serial/atmel_serial.c
    +++ b/drivers/tty/serial/atmel_serial.c
    @@ -1777,16 +1777,20 @@ static int atmel_serial_resume(struct platform_device *pdev)
    static int __devinit atmel_serial_probe(struct platform_device *pdev)
    {
    struct atmel_uart_port *port;
    +#ifdef CONFIG_OF
    struct device_node *np = pdev->dev.of_node;
    +#endif
    struct atmel_uart_data *pdata = pdev->dev.platform_data;
    void *data;
    int ret = -ENODEV;

    BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));

    +#ifdef CONFIG_OF
    if (np)
    ret = of_alias_get_id(np, "serial");
    else
    +#endif
    if (pdata)
    ret = pdata->num;

    --
    1.7.6.3


    \
     
     \ /
      Last update: 2011-10-28 13:55    [W:0.021 / U:2.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site