summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-06-03 21:31:27 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-05 17:02:51 -0700
commit5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488 (patch)
tree2acad76ca2fe8bee8090ee88de00c12c15c77768 /drivers
parent374eeb5a9d77ea719c5c46f4d70226623f4528ce (diff)
downloadlinux-stable-5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488.tar.gz
linux-stable-5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488.tar.bz2
linux-stable-5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488.zip
net: fix smc91x.c device tree support
Fix missing semicolon at end of smc91x.c match tabledevice driver. Also remove unnecessary #ifdef around of_match_table pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/smc91x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index dc4805f473e3..f6285748bd3c 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2400,8 +2400,10 @@ static const struct of_device_id smc91x_match[] = {
{ .compatible = "smsc,lan91c94", },
{ .compatible = "smsc,lan91c111", },
{},
-}
+};
MODULE_DEVICE_TABLE(of, smc91x_match);
+#else
+#define smc91x_match NULL
#endif
static struct dev_pm_ops smc_drv_pm_ops = {
@@ -2416,9 +2418,7 @@ static struct platform_driver smc_driver = {
.name = CARDNAME,
.owner = THIS_MODULE,
.pm = &smc_drv_pm_ops,
-#ifdef CONFIG_OF
.of_match_table = smc91x_match,
-#endif
},
};