Commit 672b2714 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e09793bb

drivers/char/istallion.c

+2 −15
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ static char *stli_brdnames[] = { 


/*****************************************************************************/



#ifdef MODULE

/*

 *	Define some string labels for arguments passed from the module

 *	load line. These allow for easy board definitions, and easy
@@ -381,8 +380,6 @@ MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]"); 
module_param_array(board3, charp, NULL, 0);

MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");



#endif



/*

 *	Set up a default memory address table for EISA board probing.

 *	The default addresses are all bellow 1Mbyte, which has to be the
@@ -643,14 +640,8 @@ static unsigned int stli_baudrates[] = { 
 *	Prototype all functions in this driver!

 */



#ifdef MODULE

static void	stli_argbrds(void);

static int	stli_parsebrd(stlconf_t *confp, char **argp);



static unsigned long	stli_atol(char *str);

#endif



int		stli_init(void);

static int	stli_init(void);

static int	stli_open(struct tty_struct *tty, struct file *filp);

static void	stli_close(struct tty_struct *tty, struct file *filp);

static int	stli_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -786,8 +777,6 @@ static int stli_timeron; 


static struct class *istallion_class;



#ifdef MODULE



/*

 *	Loadable module initialization stuff.

 */
@@ -954,8 +943,6 @@ static int stli_parsebrd(stlconf_t *confp, char **argp) 
	return(1);

}



#endif



/*****************************************************************************/



static int stli_open(struct tty_struct *tty, struct file *filp)
@@ -4694,7 +4681,7 @@ static struct tty_operations stli_ops = { 


/*****************************************************************************/



int __init stli_init(void)

static int __init stli_init(void)

{

	int i;

	printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);

CRA Git | Maintained and supported by SUSTech CRA and CCSE