]> Pileus Git - ~andy/linux/blobdiff - drivers/tty/serial/altera_jtaguart.c
Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block
[~andy/linux] / drivers / tty / serial / altera_jtaguart.c
index 00a73ecb2dfb0654309a023a42b7a0f19720520a..530181e49f6b13dc3127739e02fb3eb3e2e76b60 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/console.h>
+#include <linux/of.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
@@ -472,8 +473,6 @@ static struct of_device_id altera_jtaguart_match[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
-#else
-#define altera_jtaguart_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver altera_jtaguart_platform_driver = {
@@ -482,7 +481,7 @@ static struct platform_driver altera_jtaguart_platform_driver = {
        .driver = {
                .name           = DRV_NAME,
                .owner          = THIS_MODULE,
-               .of_match_table = altera_jtaguart_match,
+               .of_match_table = of_match_ptr(altera_jtaguart_match),
        },
 };