Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c73d8347 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/mtd-2.6.23 

* git://git.infradead.org/~dwmw2/mtd-2.6.23:
  [MTD] Makefile fix for mtdsuper
parents 195be1c2 bec49477

drivers/mtd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/mtd/mtdpart.c

+0 −4
Original line number Diff line number Diff line
@@ -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");