diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-08-31 02:56:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 04:42:22 -0400 |
commit | 4ccdb4c8727c9963c7aa0d6301df283cf1f8a731 (patch) | |
tree | c405c710716be713abb75097b15330f8ddea85a9 | |
parent | fc3ba9525b50ea0d1670357ece21ebedcee507ae (diff) |
spi: correct name for spi_txx9
Correct the name of the spi_txx9 driver (and their in-tree user)
instead of MODULE_ALIAS workaround. This would be preferable in the
long term.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/mips/tx4938/toshiba_rbtx4938/setup.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi_txx9.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c index 84ebff711e6e..f236b1ff8923 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c | |||
@@ -1108,7 +1108,7 @@ static void __init txx9_spi_init(unsigned long base, int irq) | |||
1108 | .flags = IORESOURCE_IRQ, | 1108 | .flags = IORESOURCE_IRQ, |
1109 | }, | 1109 | }, |
1110 | }; | 1110 | }; |
1111 | platform_device_register_simple("txx9spi", 0, | 1111 | platform_device_register_simple("spi_txx9", 0, |
1112 | res, ARRAY_SIZE(res)); | 1112 | res, ARRAY_SIZE(res)); |
1113 | } | 1113 | } |
1114 | 1114 | ||
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c index f6c3677035b0..b7f4bb239eaf 100644 --- a/drivers/spi/spi_txx9.c +++ b/drivers/spi/spi_txx9.c | |||
@@ -450,11 +450,10 @@ static int __exit txx9spi_remove(struct platform_device *dev) | |||
450 | return 0; | 450 | return 0; |
451 | } | 451 | } |
452 | 452 | ||
453 | MODULE_ALIAS("txx9spi"); /* for platform bus hotplug */ | ||
454 | static struct platform_driver txx9spi_driver = { | 453 | static struct platform_driver txx9spi_driver = { |
455 | .remove = __exit_p(txx9spi_remove), | 454 | .remove = __exit_p(txx9spi_remove), |
456 | .driver = { | 455 | .driver = { |
457 | .name = "txx9spi", | 456 | .name = "spi_txx9", |
458 | .owner = THIS_MODULE, | 457 | .owner = THIS_MODULE, |
459 | }, | 458 | }, |
460 | }; | 459 | }; |