projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ieee802154
/
mrf24j40.c
diff --git
a/drivers/net/ieee802154/mrf24j40.c
b/drivers/net/ieee802154/mrf24j40.c
index
b9be530
..
ff83e00
100644
(file)
--- a/
drivers/net/ieee802154/mrf24j40.c
+++ b/
drivers/net/ieee802154/mrf24j40.c
@@
-8,8
+8,8
@@
#include <linux/spi/spi.h>
#include <linux/interrupt.h>
#include <linux/spi/spi.h>
#include <linux/interrupt.h>
+#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/of.h>
#include <linux/regmap.h>
#include <linux/ieee802154.h>
#include <linux/irq.h>
#include <linux/regmap.h>
#include <linux/ieee802154.h>
#include <linux/irq.h>
@@
-1388,7
+1388,7
@@
MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
static struct spi_driver mrf24j40_driver = {
.driver = {
static struct spi_driver mrf24j40_driver = {
.driver = {
- .of_match_table =
of_match_ptr(mrf24j40_of_match)
,
+ .of_match_table =
mrf24j40_of_match
,
.name = "mrf24j40",
},
.id_table = mrf24j40_ids,
.name = "mrf24j40",
},
.id_table = mrf24j40_ids,