[PATCH] Input: serio: Compile error fix (altera_ps2.c)

[PATCH] Input: serio: Compile error fix (altera_ps2.c)

[Dustan Bower]

Fixed compile error, today's linux-next tree:

  CC [M]  drivers/input/serio/altera_ps2.o
drivers/input/serio/altera_ps2.c:182:1: error: expected ‘,’ or ‘;’ before ‘extern’
make[1]: *** [drivers/input/serio/altera_ps2.o] Error 1
make: *** [_module_drivers/input/serio] Error 2

Signed-off-by: Dustan Bower <dustan.bower@gmail.com>
---
 drivers/input/serio/altera_ps2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index 3fee88b..d363dc4 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -178,7 +178,7 @@ static int __devexit altera_ps2_remove(struct platform_device *pdev)
 static const struct of_device_id altera_ps2_match[] = {
 	{ .compatible = "ALTR,ps2-1.0", },
 	{},
-}
+};
 MODULE_DEVICE_TABLE(of, altera_ps2_match);
 #else /* CONFIG_OF */
 #define altera_ps2_match NULL
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Input: serio: Compile error fix (altera_ps2.c)

[Dmitry Torokhov]

On Sat, Feb 19, 2011 at 03:04:19PM -0500, Dustan Bower wrote:
> Fixed compile error, today's linux-next tree:
> 
>   CC [M]  drivers/input/serio/altera_ps2.o
> drivers/input/serio/altera_ps2.c:182:1: error: expected ‘,’ or ‘;’ before ‘extern’
> make[1]: *** [drivers/input/serio/altera_ps2.o] Error 1
> make: *** [_module_drivers/input/serio] Error 2
> 
> Signed-off-by: Dustan Bower <dustan.bower@gmail.com>

Thanks Dustan.

Grant, maybe you could amend the original patch so that we do not
introduce bisection failure point?

> ---
>  drivers/input/serio/altera_ps2.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
> index 3fee88b..d363dc4 100644
> --- a/drivers/input/serio/altera_ps2.c
> +++ b/drivers/input/serio/altera_ps2.c
> @@ -178,7 +178,7 @@ static int __devexit altera_ps2_remove(struct platform_device *pdev)
>  static const struct of_device_id altera_ps2_match[] = {
>  	{ .compatible = "ALTR,ps2-1.0", },
>  	{},
> -}
> +};
>  MODULE_DEVICE_TABLE(of, altera_ps2_match);
>  #else /* CONFIG_OF */
>  #define altera_ps2_match NULL
> -- 
> 1.7.4.1
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Input: serio: Compile error fix (altera_ps2.c)

[Grant Likely]

On Sat, Feb 19, 2011 at 2:45 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> On Sat, Feb 19, 2011 at 03:04:19PM -0500, Dustan Bower wrote:
>> Fixed compile error, today's linux-next tree:
>>
>>   CC [M]  drivers/input/serio/altera_ps2.o
>> drivers/input/serio/altera_ps2.c:182:1: error: expected ‘,’ or ‘;’ before ‘extern’
>> make[1]: *** [drivers/input/serio/altera_ps2.o] Error 1
>> make: *** [_module_drivers/input/serio] Error 2
>>
>> Signed-off-by: Dustan Bower <dustan.bower@gmail.com>
>
> Thanks Dustan.
>
> Grant, maybe you could amend the original patch so that we do not
> introduce bisection failure point?

done, thanks.

g.

>
>> ---
>>  drivers/input/serio/altera_ps2.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
>> index 3fee88b..d363dc4 100644
>> --- a/drivers/input/serio/altera_ps2.c
>> +++ b/drivers/input/serio/altera_ps2.c
>> @@ -178,7 +178,7 @@ static int __devexit altera_ps2_remove(struct platform_device *pdev)
>>  static const struct of_device_id altera_ps2_match[] = {
>>       { .compatible = "ALTR,ps2-1.0", },
>>       {},
>> -}
>> +};
>>  MODULE_DEVICE_TABLE(of, altera_ps2_match);
>>  #else /* CONFIG_OF */
>>  #define altera_ps2_match NULL
>> --
>> 1.7.4.1
>>
>
> --
> Dmitry
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Input: serio: Compile error fix (altera_ps2.c)

[Randy Dunlap]

On Sat, 19 Feb 2011 20:04:49 -0700 Grant Likely wrote:

> On Sat, Feb 19, 2011 at 2:45 PM, Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
> > On Sat, Feb 19, 2011 at 03:04:19PM -0500, Dustan Bower wrote:
> >> Fixed compile error, today's linux-next tree:
> >>
> >>   CC [M]  drivers/input/serio/altera_ps2.o
> >> drivers/input/serio/altera_ps2.c:182:1: error: expected ‘,’ or ‘;’ before ‘extern’
> >> make[1]: *** [drivers/input/serio/altera_ps2.o] Error 1
> >> make: *** [_module_drivers/input/serio] Error 2
> >>
> >> Signed-off-by: Dustan Bower <dustan.bower@gmail.com>
> >
> > Thanks Dustan.
> >
> > Grant, maybe you could amend the original patch so that we do not
> > introduce bisection failure point?
> 
> done, thanks.

Hi Grant,

Did you also fix drivers/spi/spi_oc_tiny.c and
drivers/spi/spi_altera.c ?  I hit those build errors when
CONFIG_OF=y.  Could there be others?

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html