linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: fix smc91x.c device tree support
@ 2011-06-04  7:31 Grant Likely
  2011-06-06  0:03 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Grant Likely @ 2011-06-04  7:31 UTC (permalink / raw)
  To: netdev, David S. Miller, linux-kernel, Thomas Chou

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>
---
 drivers/net/smc91x.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index dc4805f..f628574 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
 	},
 };
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] net: fix smc91x.c device tree support
  2011-06-04  7:31 [PATCH] net: fix smc91x.c device tree support Grant Likely
@ 2011-06-06  0:03 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-06-06  0:03 UTC (permalink / raw)
  To: grant.likely; +Cc: netdev, linux-kernel, thomas

From: Grant Likely <grant.likely@secretlab.ca>
Date: Sat, 04 Jun 2011 01:31:27 -0600

> 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>

Applied, thanks Grant.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-06-06  0:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-04  7:31 [PATCH] net: fix smc91x.c device tree support Grant Likely
2011-06-06  0:03 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).