diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
| commit | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch) | |
| tree | bc3ef1b64dcdb48b2d6accb51951a0d73b33262e /drivers/mtd/maps/sa1100-flash.c | |
| parent | 4d7902f22b0804730b80f7a4147f676430248a3a (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/mtd/maps/sa1100-flash.c')
| -rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 = { | |||
| 453 | .resume = sa1100_mtd_resume, | 453 | .resume = sa1100_mtd_resume, |
| 454 | .shutdown = sa1100_mtd_shutdown, | 454 | .shutdown = sa1100_mtd_shutdown, |
| 455 | .driver = { | 455 | .driver = { |
| 456 | .name = "flash", | 456 | .name = "sa1100-mtd", |
| 457 | .owner = THIS_MODULE, | 457 | .owner = THIS_MODULE, |
| 458 | }, | 458 | }, |
| 459 | }; | 459 | }; |
| @@ -474,4 +474,4 @@ module_exit(sa1100_mtd_exit); | |||
| 474 | MODULE_AUTHOR("Nicolas Pitre"); | 474 | MODULE_AUTHOR("Nicolas Pitre"); |
| 475 | MODULE_DESCRIPTION("SA1100 CFI map driver"); | 475 | MODULE_DESCRIPTION("SA1100 CFI map driver"); |
| 476 | MODULE_LICENSE("GPL"); | 476 | MODULE_LICENSE("GPL"); |
| 477 | MODULE_ALIAS("platform:flash"); | 477 | MODULE_ALIAS("platform:sa1100-mtd"); |