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 | |
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')
-rw-r--r-- | drivers/mtd/maps/bfin-async-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/ceiva.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/dc21285.c | 4 | ||||
-rw-r--r-- | drivers/mtd/maps/ipaq-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/pxa2xx-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 365c77b1b87..a7c808b577d 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * for example. All board-specific configuration goes in your | 6 | * for example. All board-specific configuration goes in your |
7 | * board resources file. | 7 | * board resources file. |
8 | * | 8 | * |
9 | * Copyright 2000 Nicolas Pitre <nico@cam.org> | 9 | * Copyright 2000 Nicolas Pitre <nico@fluxnic.net> |
10 | * Copyright 2005-2008 Analog Devices Inc. | 10 | * Copyright 2005-2008 Analog Devices Inc. |
11 | * | 11 | * |
12 | * Enter bugs at http://blackfin.uclinux.org/ | 12 | * Enter bugs at http://blackfin.uclinux.org/ |
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c index 60e68bde0fe..d41f34766e5 100644 --- a/drivers/mtd/maps/ceiva.c +++ b/drivers/mtd/maps/ceiva.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Based on: sa1100-flash.c, which has the following copyright: | 9 | * Based on: sa1100-flash.c, which has the following copyright: |
10 | * Flash memory access on SA11x0 based devices | 10 | * Flash memory access on SA11x0 based devices |
11 | * | 11 | * |
12 | * (C) 2000 Nicolas Pitre <nico@cam.org> | 12 | * (C) 2000 Nicolas Pitre <nico@fluxnic.net> |
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
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"); |
diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c index 748c85f635f..76708e796b7 100644 --- a/drivers/mtd/maps/ipaq-flash.c +++ b/drivers/mtd/maps/ipaq-flash.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based) | 2 | * Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based) |
3 | * | 3 | * |
4 | * (C) 2000 Nicolas Pitre <nico@cam.org> | 4 | * (C) 2000 Nicolas Pitre <nico@fluxnic.net> |
5 | * (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com> | 5 | * (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com> |
6 | * (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes | 6 | * (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes |
7 | */ | 7 | */ |
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 643aa06b599..74fa075c838 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c | |||
@@ -175,5 +175,5 @@ module_init(init_pxa2xx_flash); | |||
175 | module_exit(cleanup_pxa2xx_flash); | 175 | module_exit(cleanup_pxa2xx_flash); |
176 | 176 | ||
177 | MODULE_LICENSE("GPL"); | 177 | MODULE_LICENSE("GPL"); |
178 | MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>"); | 178 | MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net>"); |
179 | MODULE_DESCRIPTION("MTD map driver for Intel XScale PXA2xx"); | 179 | MODULE_DESCRIPTION("MTD map driver for Intel XScale PXA2xx"); |
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index c6210f5118d..fdb97f3d30e 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Flash memory access on SA11x0 based devices | 2 | * Flash memory access on SA11x0 based devices |
3 | * | 3 | * |
4 | * (C) 2000 Nicolas Pitre <nico@cam.org> | 4 | * (C) 2000 Nicolas Pitre <nico@fluxnic.net> |
5 | */ | 5 | */ |
6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
7 | #include <linux/types.h> | 7 | #include <linux/types.h> |