From: Adrian Bunk This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/watchdog/machzwd.c | 2 +- 25-akpm/drivers/char/watchdog/sc1200wdt.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/char/watchdog/machzwd.c~drivers-char-watchdog-make-some-code-static drivers/char/watchdog/machzwd.c --- 25/drivers/char/watchdog/machzwd.c~drivers-char-watchdog-make-some-code-static 2005-02-24 21:19:05.000000000 -0800 +++ 25-akpm/drivers/char/watchdog/machzwd.c 2005-02-24 21:19:05.000000000 -0800 @@ -488,7 +488,7 @@ out: } -void __exit zf_exit(void) +static void __exit zf_exit(void) { zf_timer_off(); diff -puN drivers/char/watchdog/sc1200wdt.c~drivers-char-watchdog-make-some-code-static drivers/char/watchdog/sc1200wdt.c --- 25/drivers/char/watchdog/sc1200wdt.c~drivers-char-watchdog-make-some-code-static 2005-02-24 21:19:05.000000000 -0800 +++ 25-akpm/drivers/char/watchdog/sc1200wdt.c 2005-02-24 21:19:05.000000000 -0800 @@ -74,9 +74,9 @@ static char banner[] __initdata = KERN_I static int timeout = 1; static int io = -1; static int io_len = 2; /* for non plug and play */ -struct semaphore open_sem; +static struct semaphore open_sem; static char expect_close; -spinlock_t sc1200wdt_lock; /* io port access serialisation */ +static spinlock_t sc1200wdt_lock; /* io port access serialisation */ #if defined CONFIG_PNP static int isapnp = 1; @@ -335,7 +335,7 @@ static int __init sc1200wdt_probe(void) #if defined CONFIG_PNP -struct pnp_device_id scl200wdt_pnp_devices[] = { +static struct pnp_device_id scl200wdt_pnp_devices[] = { /* National Semiconductor PC87307/PC97307 watchdog component */ {.id = "NSC0800", .driver_data = 0}, {.id = ""}, _