diff options
-rw-r--r-- | drivers/char/istallion.c | 17 |
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]"); | |||
381 | module_param_array(board3, charp, NULL, 0); | 380 | module_param_array(board3, charp, NULL, 0); |
382 | MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]"); | 381 | MODULE_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 | ||
647 | static void stli_argbrds(void); | ||
648 | static int stli_parsebrd(stlconf_t *confp, char **argp); | 643 | static int stli_parsebrd(stlconf_t *confp, char **argp); |
649 | 644 | static int stli_init(void); | |
650 | static unsigned long stli_atol(char *str); | ||
651 | #endif | ||
652 | |||
653 | int stli_init(void); | ||
654 | static int stli_open(struct tty_struct *tty, struct file *filp); | 645 | static int stli_open(struct tty_struct *tty, struct file *filp); |
655 | static void stli_close(struct tty_struct *tty, struct file *filp); | 646 | static void stli_close(struct tty_struct *tty, struct file *filp); |
656 | static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count); | 647 | static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count); |
@@ -786,8 +777,6 @@ static int stli_timeron; | |||
786 | 777 | ||
787 | static struct class *istallion_class; | 778 | static 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 | ||
961 | static int stli_open(struct tty_struct *tty, struct file *filp) | 948 | static 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 | ||
4697 | int __init stli_init(void) | 4684 | static 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); |