diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:08:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:08:55 -0700 |
| commit | c73d83473e47415e943c398e6612f65f6da5b3c9 (patch) | |
| tree | 136d981df718d8c2f45eba6bf50bd15ecb3efaf2 | |
| parent | 195be1c2086929efe1ca315e23f031f06e086369 (diff) | |
| parent | bec494775600b1cd7c144d31a09e1f46df9c6324 (diff) | |
Merge git://git.infradead.org/~dwmw2/mtd-2.6.23
* git://git.infradead.org/~dwmw2/mtd-2.6.23:
[MTD] Makefile fix for mtdsuper
| -rw-r--r-- | drivers/mtd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdpart.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 451adcc52b3..6d958a4566f 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -3,9 +3,9 @@ # # Core functionality. +obj-$(CONFIG_MTD) += mtd.o mtd-y := mtdcore.o mtdsuper.o mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o -obj-$(CONFIG_MTD) += $(mtd-y) obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 9c623685294..6174a97d790 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -560,7 +560,3 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types, EXPORT_SYMBOL_GPL(parse_mtd_partitions); EXPORT_SYMBOL_GPL(register_mtd_parser); EXPORT_SYMBOL_GPL(deregister_mtd_parser); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>"); -MODULE_DESCRIPTION("Generic support for partitioning of MTD devices"); |