aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/istallion.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/istallion.c')
-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 c86a718a702c..fbce2f0669d6 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -281,7 +281,6 @@ static char *stli_brdnames[] = {
281 281
282/*****************************************************************************/ 282/*****************************************************************************/
283 283
284#ifdef MODULE
285/* 284/*
286 * Define some string labels for arguments passed from the module 285 * Define some string labels for arguments passed from the module
287 * load line. These allow for easy board definitions, and easy 286 * load line. These allow for easy board definitions, and easy
@@ -380,8 +379,6 @@ MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]");
380module_param_array(board3, charp, NULL, 0); 379module_param_array(board3, charp, NULL, 0);
381MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]"); 380MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
382 381
383#endif
384
385/* 382/*
386 * Set up a default memory address table for EISA board probing. 383 * Set up a default memory address table for EISA board probing.
387 * The default addresses are all bellow 1Mbyte, which has to be the 384 * The default addresses are all bellow 1Mbyte, which has to be the
@@ -642,14 +639,8 @@ static unsigned int stli_baudrates[] = {
642 * Prototype all functions in this driver! 639 * Prototype all functions in this driver!
643 */ 640 */
644 641
645#ifdef MODULE
646static void stli_argbrds(void);
647static int stli_parsebrd(stlconf_t *confp, char **argp); 642static int stli_parsebrd(stlconf_t *confp, char **argp);
648 643static int stli_init(void);
649static unsigned long stli_atol(char *str);
650#endif
651
652int stli_init(void);
653static int stli_open(struct tty_struct *tty, struct file *filp); 644static int stli_open(struct tty_struct *tty, struct file *filp);
654static void stli_close(struct tty_struct *tty, struct file *filp); 645static void stli_close(struct tty_struct *tty, struct file *filp);
655static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count); 646static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -785,8 +776,6 @@ static int stli_timeron;
785 776
786static struct class *istallion_class; 777static struct class *istallion_class;
787 778
788#ifdef MODULE
789
790/* 779/*
791 * Loadable module initialization stuff. 780 * Loadable module initialization stuff.
792 */ 781 */
@@ -953,8 +942,6 @@ static int stli_parsebrd(stlconf_t *confp, char **argp)
953 return(1); 942 return(1);
954} 943}
955 944
956#endif
957
958/*****************************************************************************/ 945/*****************************************************************************/
959 946
960static int stli_open(struct tty_struct *tty, struct file *filp) 947static int stli_open(struct tty_struct *tty, struct file *filp)
@@ -4693,7 +4680,7 @@ static struct tty_operations stli_ops = {
4693 4680
4694/*****************************************************************************/ 4681/*****************************************************************************/
4695 4682
4696int __init stli_init(void) 4683static int __init stli_init(void)
4697{ 4684{
4698 int i; 4685 int i;
4699 printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion); 4686 printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);