Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 253384
b: refs/heads/master
c: 5fb9fb1
h: refs/heads/master
v: v3
  • Loading branch information
Grant Likely authored and David S. Miller committed Jun 6, 2011
1 parent 1516756 commit fb85d79
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 374eeb5a9d77ea719c5c46f4d70226623f4528ce
refs/heads/master: 5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488
6 changes: 3 additions & 3 deletions trunk/drivers/net/smc91x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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
},
};

Expand Down

0 comments on commit fb85d79

Please sign in to comment.