diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 (patch) | |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 /drivers/mtd/maps/dc21285.c | |
| parent | 304e6d5fe294b80e6d3107f99ec241816390ebcc (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
Diffstat (limited to 'drivers/mtd/maps/dc21285.c')
| -rw-r--r-- | drivers/mtd/maps/dc21285.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c index 42969fe051b..b3cb3a18380 100644 --- a/drivers/mtd/maps/dc21285.c +++ b/drivers/mtd/maps/dc21285.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * MTD map driver for flash on the DC21285 (the StrongARM-110 companion chip) | 2 | * MTD map driver for flash on the DC21285 (the StrongARM-110 companion chip) |
| 3 | * | 3 | * |
| 4 | * (C) 2000 Nicolas Pitre <nico@cam.org> | 4 | * (C) 2000 Nicolas Pitre <nico@fluxnic.net> |
| 5 | * | 5 | * |
| 6 | * This code is GPL | 6 | * This code is GPL |
| 7 | */ | 7 | */ |
| @@ -249,5 +249,5 @@ module_exit(cleanup_dc21285); | |||
| 249 | 249 | ||
| 250 | 250 | ||
| 251 | MODULE_LICENSE("GPL"); | 251 | MODULE_LICENSE("GPL"); |
| 252 | MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>"); | 252 | MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net>"); |
| 253 | MODULE_DESCRIPTION("MTD map driver for DC21285 boards"); | 253 | MODULE_DESCRIPTION("MTD map driver for DC21285 boards"); |