diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 11:43:14 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 11:43:14 +0200 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /drivers/mtd | |
| parent | [MTD] mtdoops printk warning fixes (diff) | |
| parent | Apply memory policies to top two highest zones when highest zone is ZONE_MOVABLE (diff) | |
| download | linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.xz linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdchar.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/mtdpart.c | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 024d0e5e3e5d..7f0b04b4caa7 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/mtdchar.c b/drivers/mtd/mtdchar.c index 942c88ec5b6a..22ed96c4b7bd 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -7,6 +7,7 @@ #include <linux/device.h> #include <linux/fs.h> +#include <linux/mm.h> #include <linux/err.h> #include <linux/init.h> #include <linux/kernel.h> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 9c6236852942..6174a97d7902 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"); |