2008-08-08 15:59:28

by Adrian Bunk

Subject: [2.6 patch] fix watchdog/at91rm9200_wdt.c compilation

This patch fixes the following compile error:

<-- snip -->

...
CC drivers/watchdog/at91rm9200_wdt.o
at91rm9200_wdt.c:188: error: 'at91_wdt_ioctl' undeclared here (not in a
make[3]: *** [drivers/watchdog/at91rm9200_wdt.o] Error 1

<-- snip -->

Reported-by: Adrian Bunk <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

---
0cbc8aa3114bc48a868de8cc9a1706b6c81dd3f4
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 2313f44..09363f1 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -129,7 +129,7 @@ static struct watchdog_info at91_wdt_info = {
/*
* Handle commands from user-space.
*/
-static long at91_wdt_ioct(struct file *file,
+static long at91_wdt_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;

2008-08-09 10:03:08

by Russell King

Subject: Re: [2.6 patch] fix watchdog/at91rm9200_wdt.c compilation

On Fri, Aug 08, 2008 at 06:57:45PM +0300, Adrian Bunk wrote:
> This patch fixes the following compile error:
>
> <-- snip -->
>
> ...
> CC drivers/watchdog/at91rm9200_wdt.o
> at91rm9200_wdt.c:188: error: 'at91_wdt_ioctl' undeclared here (not in a
> make[3]: *** [drivers/watchdog/at91rm9200_wdt.o] Error 1

Can we please get these fixes to Linus ASAP - this kind and quantity
of breakage should have never made it to Linus' kernel. (s3c2410_wdt,
at91rm9200_wdt, and wdt285 all broken with trivial compile errors).

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: