diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 15:14:50 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 15:14:50 +0900 |
| commit | abeaf33a4101764291ec79cf286e08c0966eb26e (patch) | |
| tree | bb3f8ae60d1ff0d99a907bcc223886f9d71fafea /drivers/net/gianfar.c | |
| parent | 731ba3301de41d2ffae9dd3e0f85f7361d8ad8f4 (diff) | |
| parent | 52a94909f00e0ffceeac202e517a126d57c1c523 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 1e5289ffef6..5bf31f1509c 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -2325,9 +2325,6 @@ static irqreturn_t gfar_error(int irq, void *dev_id) return IRQ_HANDLED; } -/* work with hotplug and coldplug */ -MODULE_ALIAS("platform:fsl-gianfar"); - static struct of_device_id gfar_match[] = { { @@ -2336,6 +2333,7 @@ static struct of_device_id gfar_match[] = }, {}, }; +MODULE_DEVICE_TABLE(of, gfar_match); /* Structure for a device driver */ static struct of_platform_driver gfar_driver = { |