aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-30 04:55:30 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 14:25:34 -0400
commit672b2714ae57af16fe7d760dc4e0918a7a6cb0fa (patch)
treed337918a69993af5cbfef46ed470f3e4482e9873 /drivers/char
parente09793bb9182115e6f5d15fd6571ac2b72d7a08a (diff)
[PATCH] fix ISTALLION=y
drivers/char/istallion.c: In function ‘stli_initbrds’: drivers/char/istallion.c:4150: error: implicit declaration of function ‘stli_parsebrd’ drivers/char/istallion.c:4150: error: ‘stli_brdsp’ undeclared (first use in this function) drivers/char/istallion.c:4150: error: (Each undeclared identifier is reported only once drivers/char/istallion.c:4150: error: for each function it appears in.) drivers/char/istallion.c:4164: error: implicit declaration of function ‘stli_argbrds’ While I was at it, I also removed the #ifdef MODULE around the initialation code to allow it to perhaps work when built into the kernel and made a needlessly global function static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/istallion.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index c74e5660a9b7..18c0dcf894cd 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -282,7 +282,6 @@ static char *stli_brdnames[] = {
282 282
283/*****************************************************************************/ 283/*****************************************************************************/
284 284
285#ifdef MODULE
286/* 285/*
287 * Define some string labels for arguments passed from the module 286 * Define some string labels for arguments passed from the module
288 * load line. These allow for easy board definitions, and easy 287 * load line. These allow for easy board definitions, and easy
@@ -381,8 +380,6 @@ MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]");
381module_param_array(board3, charp, NULL, 0); 380module_param_array(board3, charp, NULL, 0);
382MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]"); 381MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
383 382
384#endif
385
386/* 383/*
387 * Set up a default memory address table for EISA board probing. 384 * Set up a default memory address table for EISA board probing.
388 * The default addresses are all bellow 1Mbyte, which has to be the 385 * The default addresses are all bellow 1Mbyte, which has to be the
@@ -643,14 +640,8 @@ static unsigned int stli_baudrates[] = {
643 * Prototype all functions in this driver! 640 * Prototype all functions in this driver!
644 */ 641 */
645 642
646#ifdef MODULE
647static void stli_argbrds(void);
648static int stli_parsebrd(stlconf_t *confp, char **argp); 643static int stli_parsebrd(stlconf_t *confp, char **argp);
649 644static int stli_init(void);
650static unsigned long stli_atol(char *str);
651#endif
652
653int stli_init(void);
654static int stli_open(struct tty_struct *tty, struct file *filp); 645static int stli_open(struct tty_struct *tty, struct file *filp);
655static void stli_close(struct tty_struct *tty, struct file *filp); 646static void stli_close(struct tty_struct *tty, struct file *filp);
656static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count); 647static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -786,8 +777,6 @@ static int stli_timeron;
786 777
787static struct class *istallion_class; 778static struct class *istallion_class;
788 779
789#ifdef MODULE
790
791/* 780/*
792 * Loadable module initialization stuff. 781 * Loadable module initialization stuff.
793 */ 782 */
@@ -954,8 +943,6 @@ static int stli_parsebrd(stlconf_t *confp, char **argp)
954 return(1); 943 return(1);
955} 944}
956 945
957#endif
958
959/*****************************************************************************/ 946/*****************************************************************************/
960 947
961static int stli_open(struct tty_struct *tty, struct file *filp) 948static int stli_open(struct tty_struct *tty, struct file *filp)
@@ -4694,7 +4681,7 @@ static struct tty_operations stli_ops = {
4694 4681
4695/*****************************************************************************/ 4682/*****************************************************************************/
4696 4683
4697int __init stli_init(void) 4684static int __init stli_init(void)
4698{ 4685{
4699 int i; 4686 int i;
4700 printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion); 4687 printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);