diff options
| author | Uwe Kleine-König | 2009-01-31 01:21:58 +0100 |
|---|---|---|
| committer | Uwe Kleine-König | 2009-01-31 01:21:58 +0100 |
| commit | bcc8f3e01facc51b9d4f6351cd866f19eac0b5ae (patch) | |
| tree | 03494f210eac525ab9f641c3a12a85d8aa2b5d7e | |
| parent | annotate that [fp, #-4] is the saved lr (diff) | |
| download | kernel-qcow2-linux-bcc8f3e01facc51b9d4f6351cd866f19eac0b5ae.tar.gz kernel-qcow2-linux-bcc8f3e01facc51b9d4f6351cd866f19eac0b5ae.tar.xz kernel-qcow2-linux-bcc8f3e01facc51b9d4f6351cd866f19eac0b5ae.zip | |
rename platform_driver name "flash" to "sa1100-mtd"
"flash" is a very generic name for a platform_driver that is only
available on SA11x0.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Nicolas Pitre <nico@marvell.com>
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index c1fbd5b5f9c4..23cfdd593954 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -289,7 +289,7 @@ static struct platform_device sa11x0pcmcia_device = { }; static struct platform_device sa11x0mtd_device = { - .name = "flash", + .name = "sa1100-mtd", .id = -1, }; diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 7df6bbf0e4d9..6f6a0f6dafd6 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c @@ -453,7 +453,7 @@ static struct platform_driver sa1100_mtd_driver = { .resume = sa1100_mtd_resume, .shutdown = sa1100_mtd_shutdown, .driver = { - .name = "flash", + .name = "sa1100-mtd", .owner = THIS_MODULE, }, }; @@ -474,4 +474,4 @@ module_exit(sa1100_mtd_exit); MODULE_AUTHOR("Nicolas Pitre"); MODULE_DESCRIPTION("SA1100 CFI map driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:flash"); +MODULE_ALIAS("platform:sa1100-mtd"); |