Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / drivers / tty / serial / uartlite.c

diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 8af1ed83a4c090590cf09d6f737e5520934f18b1..6cd414341d5ecebe293ecddc326d3be5832b88af 100644 (file)
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -15,6 +15,7 @@
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/tty.h>
+#include <linux/tty_flip.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
@@ -568,8 +569,6 @@ static struct of_device_id ulite_of_match[] __devinitdata = {
        {}
 };
 MODULE_DEVICE_TABLE(of, ulite_of_match);
-#else /* CONFIG_OF */
-#define ulite_of_match NULL
 #endif /* CONFIG_OF */
 
 static int __devinit ulite_probe(struct platform_device *pdev)
@@ -609,7 +608,7 @@ static struct platform_driver ulite_platform_driver = {
        .driver = {
                .owner = THIS_MODULE,
                .name  = "uartlite",
-               .of_match_table = ulite_of_match,
+               .of_match_table = of_match_ptr(ulite_of_match),
        },
 };