diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/serial/68360serial.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/serial/68360serial.c')
| -rw-r--r-- | drivers/serial/68360serial.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index b116122e569..170c9d2a749 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c @@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = { .tiocmset = rs_360_tiocmset, }; -/* int __init rs_360_init(void) */ -int rs_360_init(void) +static int __init rs_360_init(void) { struct serial_state * state; ser_info_t *info; @@ -2827,10 +2826,7 @@ int rs_360_init(void) return 0; } - - - - +module_init(rs_360_init); /* This must always be called before the rs_360_init() function, otherwise * it blows away the port control information. |