OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline 

Fix the epca driver to call epca_setup() if digiepca=xxx is included on the
command line and the epca driver is built in.

epca_setup() used to be called from init/main.c in 2.2 kernels, but somewhere
along the way that call was removed but not replaced.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells 2008-07-22 11:20:45 +01:00 committed by Linus Torvalds
parent e129deff3d
commit 88e882497d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/epca.c
View File

@ -186,7 +186,6 @@ static void pc_throttle(struct tty_struct *tty);
static void pc_unthrottle(struct tty_struct *tty);
static int pc_send_break(struct tty_struct *tty, int msec);
static void setup_empty_event(struct tty_struct *tty, struct channel *ch);
static void epca_setup(char *, int *);
static int pc_write(struct tty_struct *, const unsigned char *, int);
static int pc_init(void);
@ -2513,7 +2512,8 @@ static void setup_empty_event(struct tty_struct *tty, struct channel *ch)
memoff(ch);
}
static void epca_setup(char *str, int *ints)
#ifndef MODULE
static void __init epca_setup(char *str, int *ints)
{
struct board_info board;
int index, loop, last;
@ -2767,6 +2767,17 @@ static void epca_setup(char *str, int *ints)
num_cards++;
}
static int __init epca_real_setup(char *str)
{
int ints[11];
epca_setup(get_options(str, 11, ints), ints);
return 1;
}
__setup("digiepca", epca_real_setup);
#endif
enum epic_board_types {
brd_xr = 0,
brd_xem,