diff options
| author | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
| commit | a8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch) | |
| tree | 1d1409855f8ad5beabafe061c6453edd84ba94c8 /drivers/char/isicom.c | |
| parent | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff) | |
| parent | 099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/isicom.c')
| -rw-r--r-- | drivers/char/isicom.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 601c7fccb4c..1bbf507adda 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -1756,7 +1756,7 @@ static void isicom_flush_buffer(struct tty_struct * tty) } -static int __init register_ioregion(void) +static int __devinit register_ioregion(void) { int count, done=0; for (count=0; count < BOARD_COUNT; count++ ) { @@ -1771,7 +1771,7 @@ static int __init register_ioregion(void) return done; } -static void __exit unregister_ioregion(void) +static void unregister_ioregion(void) { int count; for (count=0; count < BOARD_COUNT; count++ ) @@ -1803,7 +1803,7 @@ static struct tty_operations isicom_ops = { .tiocmset = isicom_tiocmset, }; -static int __init register_drivers(void) +static int __devinit register_drivers(void) { int error; @@ -1834,7 +1834,7 @@ static int __init register_drivers(void) return 0; } -static void __exit unregister_drivers(void) +static void unregister_drivers(void) { int error = tty_unregister_driver(isicom_normal); if (error) @@ -1842,7 +1842,7 @@ static void __exit unregister_drivers(void) put_tty_driver(isicom_normal); } -static int __init register_isr(void) +static int __devinit register_isr(void) { int count, done=0; unsigned long irqflags; @@ -1883,7 +1883,7 @@ static void __exit unregister_isr(void) } } -static int __init isicom_init(void) +static int __devinit isicom_init(void) { int card, channel, base; struct isi_port * port; |