diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 15:32:56 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 15:32:56 (GMT) |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/serial/imx.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
| download | linux-fsl-qoriq-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/serial/imx.c')
| -rw-r--r-- | drivers/serial/imx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 5b3933b..4a54ff5 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -36,7 +36,7 @@ #include <linux/init.h> #include <linux/console.h> #include <linux/sysrq.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/serial_core.h> @@ -995,6 +995,7 @@ static int __init imx_serial_init(void) static void __exit imx_serial_exit(void) { uart_unregister_driver(&imx_reg); + driver_unregister(&serial_imx_driver); } module_init(imx_serial_init); |