diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-23 00:56:50 +0300 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-23 00:57:00 +0300 |
| commit | 9bde36afcaf0ec2ad9f03974da41875c759a4fe8 (patch) | |
| tree | 5b6f2fd6c86d5dadaf427c302ed35f738c2be55b /drivers/net/ethoc.c | |
| parent | f020c39e51b1ef8389d5cf38190d32f55ff9d556 (diff) | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| download | linux-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.tar.xz | |
Merge branch 'devicetree/next' into spi/next
To pick up removal of #ifdef around .of_match_table
Diffstat (limited to 'drivers/net/ethoc.c')
| -rw-r--r-- | drivers/net/ethoc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index b79d7e1555d5..db0290f05bdf 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -1163,15 +1163,11 @@ static int ethoc_resume(struct platform_device *pdev) # define ethoc_resume NULL #endif -#ifdef CONFIG_OF static struct of_device_id ethoc_match[] = { - { - .compatible = "opencores,ethoc", - }, + { .compatible = "opencores,ethoc", }, {}, }; MODULE_DEVICE_TABLE(of, ethoc_match); -#endif static struct platform_driver ethoc_driver = { .probe = ethoc_probe, @@ -1181,9 +1177,7 @@ static struct platform_driver ethoc_driver = { .driver = { .name = "ethoc", .owner = THIS_MODULE, -#ifdef CONFIG_OF .of_match_table = ethoc_match, -#endif }, }; |