Merge with temp tree to get David's gdb inferior calls patch

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index de166608c59e..b8899f560b5e 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -466,7 +466,7 @@ static int	stl_parsebrd(stlconf_t *confp, char **argp);
 
 static unsigned long stl_atol(char *str);
 
-int             stl_init(void);
+static int      stl_init(void);
 static int      stl_open(struct tty_struct *tty, struct file *filp);
 static void     stl_close(struct tty_struct *tty, struct file *filp);
 static int      stl_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -3063,7 +3063,7 @@ static struct tty_operations stl_ops = {
 
 /*****************************************************************************/
 
-int __init stl_init(void)
+static int __init stl_init(void)
 {
         int i;
         printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);