projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] usbfs: use the correct signal number for disconnection
[powerpc.git]
/
drivers
/
char
/
riscom8.c
diff --git
a/drivers/char/riscom8.c
b/drivers/char/riscom8.c
index
050e70e
..
f1c94f7
100644
(file)
--- a/
drivers/char/riscom8.c
+++ b/
drivers/char/riscom8.c
@@
-82,7
+82,6
@@
static struct riscom_board * IRQ_to_board[16];
static struct tty_driver *riscom_driver;
static unsigned char * tmp_buf;
static struct riscom_board * IRQ_to_board[16];
static struct tty_driver *riscom_driver;
static unsigned char * tmp_buf;
-static DECLARE_MUTEX(tmp_buf_sem);
static unsigned long baud_table[] = {
0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
static unsigned long baud_table[] = {
0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
@@
-626,7
+625,7
@@
static inline int rc_setup_board(struct riscom_board * bp)
if (bp->flags & RC_BOARD_ACTIVE)
return 0;
if (bp->flags & RC_BOARD_ACTIVE)
return 0;
- error = request_irq(bp->irq, rc_interrupt,
SA_INTERRUPT
,
+ error = request_irq(bp->irq, rc_interrupt,
IRQF_DISABLED
,
"RISCom/8", NULL);
if (error)
return error;
"RISCom/8", NULL);
if (error)
return error;
@@
-1635,7
+1634,6
@@
static inline int rc_init_drivers(void)
memset(IRQ_to_board, 0, sizeof(IRQ_to_board));
riscom_driver->owner = THIS_MODULE;
riscom_driver->name = "ttyL";
memset(IRQ_to_board, 0, sizeof(IRQ_to_board));
riscom_driver->owner = THIS_MODULE;
riscom_driver->name = "ttyL";
- riscom_driver->devfs_name = "tts/L";
riscom_driver->major = RISCOM8_NORMAL_MAJOR;
riscom_driver->type = TTY_DRIVER_TYPE_SERIAL;
riscom_driver->subtype = SERIAL_TYPE_NORMAL;
riscom_driver->major = RISCOM8_NORMAL_MAJOR;
riscom_driver->type = TTY_DRIVER_TYPE_SERIAL;
riscom_driver->subtype = SERIAL_TYPE_NORMAL;
@@
-1744,10
+1742,10
@@
static int iobase;
static int iobase1;
static int iobase2;
static int iobase3;
static int iobase1;
static int iobase2;
static int iobase3;
-
MODULE_PARM(iobase, "i"
);
-
MODULE_PARM(iobase1, "i"
);
-
MODULE_PARM(iobase2, "i"
);
-
MODULE_PARM(iobase3, "i"
);
+
module_param(iobase, int, 0
);
+
module_param(iobase1, int, 0
);
+
module_param(iobase2, int, 0
);
+
module_param(iobase3, int, 0
);
MODULE_LICENSE("GPL");
#endif /* MODULE */
MODULE_LICENSE("GPL");
#endif /* MODULE */