lkml.org 
[lkml]   [2009]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the trivial tree with the arm tree
    On Mon, 7 Sep 2009, Stephen Rothwell wrote:

    > Today's linux-next merge of the trivial tree got a conflict in
    > arch/arm/mach-w90x900/w90p910.c between commit
    > 35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
    > dev.c and modify some files of w90p910 platform") from the arm tree and
    > commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
    > unnecessary semicolons") from the trivial tree.
    >
    > The former commit moved the code changed by the latter into a different
    > file (arch/arm/mach-w90x900/cpu.c - and removed the old file). Its not
    > important enough to fix it there (so I just removed this file), but maybe
    > the part of the trivial commit touching this file could be sent to the
    > arm maintainer.

    Sure, here we go. Russel, could you please apply this on top of your
    current tree? (I have already dropped the bits touching arch/arm from
    trivial queue). Thanks.



    From: Joe Perches <joe@perches.com>
    Subject: trivial: remove unnecessary semicolons

    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

    ---

    diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
    index 412aa49..799c11e 100644
    --- a/arch/arm/mach-at91/at91cap9_devices.c
    +++ b/arch/arm/mach-at91/at91cap9_devices.c
    @@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
    */
    usba_udc_data.pdata.vbus_pin = -EINVAL;
    usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
    - memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
    + memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));

    if (data && data->vbus_pin > 0) {
    at91_set_gpio_input(data->vbus_pin, 0);
    diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
    index 7281865..e87237b 100644
    --- a/arch/arm/mach-at91/at91sam9rl_devices.c
    +++ b/arch/arm/mach-at91/at91sam9rl_devices.c
    @@ -99,7 +99,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
    */
    usba_udc_data.pdata.vbus_pin = -EINVAL;
    usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
    - memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
    + memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));

    if (data && data->vbus_pin > 0) {
    at91_set_gpio_input(data->vbus_pin, 0);
    diff --git a/arch/arm/mach-w90x900/w90p910.c b/arch/arm/mach-w90x900/w90p910.c
    index 1c97e49..0399a24 100644
    --- a/arch/arm/mach-w90x900/w90p910.c
    +++ b/arch/arm/mach-w90x900/w90p910.c
    @@ -62,7 +62,7 @@ static DEFINE_CLK(atapi, 6);
    static DEFINE_CLK(emc, 7);
    static DEFINE_CLK(usbd, 8);
    static DEFINE_CLK(usbh, 9);
    -static DEFINE_CLK(g2d, 10);;
    +static DEFINE_CLK(g2d, 10);
    static DEFINE_CLK(pwm, 18);
    static DEFINE_CLK(ps2, 24);
    static DEFINE_CLK(kpi, 25);
    diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c
    index 8aee763..c2106d5 100644
    --- a/arch/arm/plat-mxc/irq.c
    +++ b/arch/arm/plat-mxc/irq.c
    @@ -53,7 +53,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio)
    unsigned int mask = 0x0F << irq % 8 * 4;

    if (irq >= MXC_INTERNAL_IRQS)
    - return -EINVAL;;
    + return -EINVAL;

    temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
    temp &= ~mask;


    \
     
     \ /
      Last update: 2009-09-07 17:17    [W:0.024 / U:62.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site