2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index edec457d361d..333d23122226 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -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.
 
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index f8ce79b446ed..02a03e67109c 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -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;