linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / maps / nettel.c

diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index 0994b5b..632eb2a 100644 (file)
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -20,8 +20,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/cfi.h>
 #include <linux/reboot.h>
-#include <linux/kdev_t.h>
-#include <linux/root_dev.h>
 #include <asm/io.h>
 
 /****************************************************************************/
@@ -130,7 +128,8 @@ static struct mtd_partition nettel_amd_partitions[] = {
        }
 };
 
-#define NUM_AMD_PARTITIONS ARRAY_SIZE(nettel_amd_partitions)
+#define NUM_AMD_PARTITIONS \
+       (sizeof(nettel_amd_partitions)/sizeof(nettel_amd_partitions[0]))
 
 /****************************************************************************/
 
@@ -190,7 +189,7 @@ int nettel_eraseconfig(void)
                set_current_state(TASK_INTERRUPTIBLE);
                add_wait_queue(&wait_q, &wait);
 
-               ret = mtd->erase(mtd, &nettel_erase);
+               ret = MTD_ERASE(mtd, &nettel_erase);
                if (ret) {
                        set_current_state(TASK_RUNNING);
                        remove_wait_queue(&wait_q, &wait);