Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[powerpc.git] / drivers / mtd / maps / ixp2000.c

diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index c5b5f44..a9f86c7 100644 (file)
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ixp2000.c,v 1.5 2004/11/16 17:15:48 dsaxena Exp $
+ * $Id: ixp2000.c,v 1.6 2005/03/18 14:07:46 gleixner Exp $
  *
  * drivers/mtd/maps/ixp2000.c
  *
@@ -30,7 +30,6 @@
 
 #include <asm/io.h>
 #include <asm/hardware.h>
-#include <asm/mach-types.h>
 #include <asm/mach/flash.h>
 
 #include <linux/reboot.h>
@@ -216,11 +215,6 @@ static int ixp2000_flash_probe(struct device *_dev)
                goto Error;
        }
 
-       /*
-        * Setup read mode for FLASH
-        */
-       *IXP2000_SLOWPORT_FRM = 1;
-
 #if defined(__ARMEB__)
        /*
         * Enable erratum 44 workaround for NPUs with broken slowport