diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 02:14:50 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 02:14:50 -0400 |
| commit | abeaf33a4101764291ec79cf286e08c0966eb26e (patch) | |
| tree | bb3f8ae60d1ff0d99a907bcc223886f9d71fafea /drivers/net/fs_enet/fs_enet-main.c | |
| parent | 731ba3301de41d2ffae9dd3e0f85f7361d8ad8f4 (diff) | |
| parent | 52a94909f00e0ffceeac202e517a126d57c1c523 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/mm/cache-sh4.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", |