Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9229376e9beba0dd449dd4869283545c1d042128

Authored by Adrian Bunk
Committed by Wim Van Sebroeck
1 parent 3f11df21ac
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation 

This patch fixes the following compile error caused by
commit 20d35f3e50ea7e573f9568b9fce4e98523aaee5d
([WATCHDOG 22/57] ixp4xx_wdt: unlocked_ioctl):

<--  snip  -->

...
  CC      drivers/watchdog/ixp4xx_wdt.o
ixp4xx_wdt.c:32: error: expected '=', ',', ';', 'asm' or '__attribute__'
ixp4xx_wdt.c: In function 'wdt_enable':
ixp4xx_wdt.c:41: error: 'wdt_lock' undeclared (first use in this
ixp4xx_wdt.c:41: error: (Each undeclared identifier is reported only
ixp4xx_wdt.c:41: error: for each function it appears in.)
ixp4xx_wdt.c: In function 'wdt_disable':
ixp4xx_wdt.c:52: error: 'wdt_lock' undeclared (first use in this
ixp4xx_wdt.c: In function 'ixp4xx_wdt_init':
ixp4xx_wdt.c:186: error: 'wdt_lock' undeclared (first use in this
make[3]: *** [drivers/watchdog/ixp4xx_wdt.o] Error 1

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/watchdog/ixp4xx_wdt.c
Diff comments   View file @ 9229376
... ... @@ -29,7 +29,7 @@
29 29 static int heartbeat = 60; /* (secs) Default is 1 minute */
30 30 static unsigned long wdt_status;
31 31 static unsigned long boot_status;
32   -static spin_lock_t wdt_lock;
  32 +static DEFINE_SPINLOCK(wdt_lock);
33 33  
34 34 #define WDT_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000UL)
35 35