projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89ce376
)
drivers/net: Use of_match_ptr() macro in smsc911x.c
author
Sachin Kamat
<
[email protected]
>
Wed, 19 Dec 2012 01:17:10 +0000
(
01:17
+0000)
committer
David S. Miller
<
[email protected]
>
Wed, 19 Dec 2012 20:50:07 +0000
(12:50 -0800)
Add CONFIG_OF guard and use of_match_ptr macro.
Signed-off-by: Sachin Kamat <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/smsc/smsc911x.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/smsc/smsc911x.c
b/drivers/net/ethernet/smsc/smsc911x.c
index 4616bf27d5150fc5b54a114c7d91f4aac15f8122..e112877d15d3288c1f04e577501bd960faf9aa67 100644
(file)
--- a/
drivers/net/ethernet/smsc/smsc911x.c
+++ b/
drivers/net/ethernet/smsc/smsc911x.c
@@
-2575,11
+2575,13
@@
static const struct dev_pm_ops smsc911x_pm_ops = {
#define SMSC911X_PM_OPS NULL
#endif
+#ifdef CONFIG_OF
static const struct of_device_id smsc911x_dt_ids[] = {
{ .compatible = "smsc,lan9115", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, smsc911x_dt_ids);
+#endif
static struct platform_driver smsc911x_driver = {
.probe = smsc911x_drv_probe,
@@
-2588,7
+2590,7
@@
static struct platform_driver smsc911x_driver = {
.name = SMSC_CHIPNAME,
.owner = THIS_MODULE,
.pm = SMSC911X_PM_OPS,
- .of_match_table =
smsc911x_dt_ids
,
+ .of_match_table =
of_match_ptr(smsc911x_dt_ids)
,
},
};