diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-27 04:03:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-27 04:03:26 -0400 |
| commit | cfadf853f6cd9689f79a63ca960c6f9d6665314f (patch) | |
| tree | 35418e342d9783f0974ea33ef03875aa21d2362a /drivers/net/can | |
| parent | 05423b241311c9380b7280179295bac7794281b6 (diff) | |
| parent | f568a926a353d6816b3704d7367f34371df44ce7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sh_eth.c
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/sja1000/sja1000_of_platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index 3373560405ba..9dd076a626a5 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c | |||
| @@ -213,6 +213,7 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = { | |||
| 213 | {.compatible = "nxp,sja1000"}, | 213 | {.compatible = "nxp,sja1000"}, |
| 214 | {}, | 214 | {}, |
| 215 | }; | 215 | }; |
| 216 | MODULE_DEVICE_TABLE(of, sja1000_ofp_table); | ||
| 216 | 217 | ||
| 217 | static struct of_platform_driver sja1000_ofp_driver = { | 218 | static struct of_platform_driver sja1000_ofp_driver = { |
| 218 | .owner = THIS_MODULE, | 219 | .owner = THIS_MODULE, |