diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-06 03:26:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-06 03:26:39 -0500 |
commit | ddaf1b27edf72372242d752730d526b79312a44e (patch) | |
tree | 9eecc305c4a9800d52a8df7df42adac56683f9c6 /drivers/serial/apbuart.c | |
parent | d13500981e7df7f0e84d7f37f85d720cefe6043e (diff) |
apbuart: Fix build and missing driver unregister.
linux/of_platform.h needs to be included
OF driver needs to be unregistered
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/apbuart.c')
-rw-r--r-- | drivers/serial/apbuart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c index 5f9dec38db81..a1e95033da5b 100644 --- a/drivers/serial/apbuart.c +++ b/drivers/serial/apbuart.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
26 | #include <linux/of.h> | 26 | #include <linux/of.h> |
27 | #include <linux/of_device.h> | 27 | #include <linux/of_device.h> |
28 | #include <linux/of_platform.h> | ||
28 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
29 | #include <linux/io.h> | 30 | #include <linux/io.h> |
30 | #include <linux/serial_core.h> | 31 | #include <linux/serial_core.h> |
@@ -676,8 +677,7 @@ static int __init grlib_apbuart_init(void) | |||
676 | return ret; | 677 | return ret; |
677 | } | 678 | } |
678 | 679 | ||
679 | ret = of_register_driver(&grlib_apbuart_of_driver, &of_platform_bus_type); | 680 | ret = of_register_platform_driver(&grlib_apbuart_of_driver); |
680 | |||
681 | if (ret) { | 681 | if (ret) { |
682 | printk(KERN_ERR | 682 | printk(KERN_ERR |
683 | "%s: of_register_platform_driver failed (%i)\n", | 683 | "%s: of_register_platform_driver failed (%i)\n", |
@@ -698,7 +698,7 @@ static void __exit grlib_apbuart_exit(void) | |||
698 | &grlib_apbuart_ports[i]); | 698 | &grlib_apbuart_ports[i]); |
699 | 699 | ||
700 | uart_unregister_driver(&grlib_apbuart_driver); | 700 | uart_unregister_driver(&grlib_apbuart_driver); |
701 | 701 | of_unregister_platform_driver(&grlib_apbuart_of_driver); | |
702 | } | 702 | } |
703 | 703 | ||
704 | module_init(grlib_apbuart_init); | 704 | module_init(grlib_apbuart_init); |