Skip to content

Commit

Permalink
mtd: h1910: convert to mtd_device_register()
Browse files Browse the repository at this point in the history
Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Jamie Iles authored and David Woodhouse committed May 25, 2011
1 parent 99335d0 commit c4a5522
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/mtd/nand/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
5 changes: 1 addition & 4 deletions drivers/mtd/nand/h1910.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ static struct mtd_info *h1910_nand_mtd = NULL;
* Module stuff
*/

#ifdef CONFIG_MTD_PARTITIONS
/*
* Define static partitions for flash device
*/
Expand All @@ -50,8 +49,6 @@ static struct mtd_partition partition_info[] = {

#define NUM_PARTITIONS 1

#endif

/*
* hardware specific access to control-lines
*
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c4a5522

Please sign in to comment.