diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:00:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:00:14 +0100 |
| commit | 92bf73e90a35d40ebc1446488218f03833b36f86 (patch) | |
| tree | 8aaae58fcb7f3e06e63a5214f910acf47f4cc9d6 /drivers/serial/ioc3_serial.c | |
| parent | 447557ac7ce120306b4a31d6003faef39cb1bf14 (diff) | |
| parent | 915b0d0104b72fd36af088ba4b11b5690bc96a6c (diff) | |
| download | kernel-crypto-92bf73e90a35d40ebc1446488218f03833b36f86.tar.gz kernel-crypto-92bf73e90a35d40ebc1446488218f03833b36f86.tar.xz kernel-crypto-92bf73e90a35d40ebc1446488218f03833b36f86.zip | |
Merge branch 'x86/irq' into perfcounters/core
( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )
Diffstat (limited to 'drivers/serial/ioc3_serial.c')
| -rw-r--r-- | drivers/serial/ioc3_serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 6dd98f9fb89..ae3699d77dd 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c @@ -2149,7 +2149,7 @@ out4: return ret; } -static struct ioc3_submodule ioc3uart_submodule = { +static struct ioc3_submodule ioc3uart_ops = { .name = "IOC3uart", .probe = ioc3uart_probe, .remove = ioc3uart_remove, @@ -2173,7 +2173,7 @@ static int __devinit ioc3uart_init(void) __func__); return ret; } - ret = ioc3_register_submodule(&ioc3uart_submodule); + ret = ioc3_register_submodule(&ioc3uart_ops); if (ret) uart_unregister_driver(&ioc3_uart); return ret; @@ -2181,7 +2181,7 @@ static int __devinit ioc3uart_init(void) static void __devexit ioc3uart_exit(void) { - ioc3_unregister_submodule(&ioc3uart_submodule); + ioc3_unregister_submodule(&ioc3uart_ops); uart_unregister_driver(&ioc3_uart); } |