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

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
...@@ -92,7 +92,7 @@ config MTD_NAND_EDB7312 ...@@ -92,7 +92,7 @@ config MTD_NAND_EDB7312
config MTD_NAND_H1900 config MTD_NAND_H1900
tristate "iPAQ H1900 flash" tristate "iPAQ H1900 flash"
depends on ARCH_PXA && MTD_PARTITIONS depends on ARCH_PXA
help help
This enables the driver for the iPAQ h1900 flash. This enables the driver for the iPAQ h1900 flash.
......
...@@ -38,7 +38,6 @@ static struct mtd_info *h1910_nand_mtd = NULL; ...@@ -38,7 +38,6 @@ static struct mtd_info *h1910_nand_mtd = NULL;
* Module stuff * Module stuff
*/ */
#ifdef CONFIG_MTD_PARTITIONS
/* /*
* Define static partitions for flash device * Define static partitions for flash device
*/ */
...@@ -50,8 +49,6 @@ static struct mtd_partition partition_info[] = { ...@@ -50,8 +49,6 @@ static struct mtd_partition partition_info[] = {
#define NUM_PARTITIONS 1 #define NUM_PARTITIONS 1
#endif
/* /*
* hardware specific access to control-lines * hardware specific access to control-lines
* *
...@@ -154,7 +151,7 @@ static int __init h1910_init(void) ...@@ -154,7 +151,7 @@ static int __init h1910_init(void)
/* Register the partitions */ /* Register the partitions */
printk(KERN_NOTICE "Using %s partition definition\n", part_type); 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 happy */
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment