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/fs_enet/fs_enet-main.c | |
| 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/fs_enet/fs_enet-main.c')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 2bc2d2b20644..ec2f5034457f 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
| @@ -1110,6 +1110,7 @@ static struct of_device_id fs_enet_match[] = { | |||
| 1110 | #endif | 1110 | #endif |
| 1111 | {} | 1111 | {} |
| 1112 | }; | 1112 | }; |
| 1113 | MODULE_DEVICE_TABLE(of, fs_enet_match); | ||
| 1113 | 1114 | ||
| 1114 | static struct of_platform_driver fs_enet_driver = { | 1115 | static struct of_platform_driver fs_enet_driver = { |
| 1115 | .name = "fs_enet", | 1116 | .name = "fs_enet", |