diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 10:04:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 10:04:25 -0800 |
commit | 061afe9fe1a295ef950cf7e6c92fa7d4ae226f28 (patch) | |
tree | 772a774fc625eba3d7737dc208cf3e2871e5d1fc /drivers/serial | |
parent | 942c88cc112d9038049a4d66dd0fb0da7b30667f (diff) | |
parent | ff740fb02146c83d96def1b897ed232b4e0fbcfd (diff) | |
download | linux-stable-061afe9fe1a295ef950cf7e6c92fa7d4ae226f28.tar.gz linux-stable-061afe9fe1a295ef950cf7e6c92fa7d4ae226f28.tar.bz2 linux-stable-061afe9fe1a295ef950cf7e6c92fa7d4ae226f28.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] SN: prevent IRQ retargetting in request_irq()
[IA64] Fix section mismatch ioc3uart_init()/ioc3uart_submodule
[IA64] Clear up section mismatch for ioc4_ide_attach_one.
[IA64] Clear up section mismatch with arch_unregister_cpu()
[IA64] Clear up section mismatch for sn_check_wars.
[IA64] Updated the generic_defconfig to work with the 2.6.28-rc7 kernel.
[IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
[IA64] eliminate NULL test and memset after alloc_bootmem
[IA64] remove BUILD_BUG_ON from paravirt_getreg()
Diffstat (limited to 'drivers/serial')
-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 6dd98f9fb89c..ae3699d77dd0 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); } |