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

Commit c4a55220 authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse
Browse files

mtd: h1910: convert to mtd_device_register() 



Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 99335d00

drivers/mtd/nand/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ config MTD_NAND_EDB7312 


config MTD_NAND_H1900

	tristate "iPAQ H1900 flash"

	depends on ARCH_PXA && MTD_PARTITIONS

	depends on ARCH_PXA

	help

	  This enables the driver for the iPAQ h1900 flash.

drivers/mtd/nand/h1910.c

+1 −4
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ static struct mtd_info *h1910_nand_mtd = NULL; 
 * Module stuff

 */



#ifdef CONFIG_MTD_PARTITIONS

/*

 * Define static partitions for flash device

 */
@@ -50,8 +49,6 @@ static struct mtd_partition partition_info[] = { 


#define NUM_PARTITIONS 1



#endif



/*

 *	hardware specific access to control-lines

 *
@@ -154,7 +151,7 @@ static int __init h1910_init(void) 


	/* Register the partitions */

	printk(KERN_NOTICE "Using %s partition definition\n", part_type);

	add_mtd_partitions(h1910_nand_mtd, mtd_parts, mtd_parts_nb);

	mtd_device_register(h1910_nand_mtd, mtd_parts, mtd_parts_nb);



	/* Return happy */

	return 0;