Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[linux-2.6-block.git] / arch / arm / mach-s3c24xx / simtec-nor.c

diff --git a/arch/arm/mach-s3c24xx/simtec-nor.c b/arch/arm/mach-s3c24xx/simtec-nor.c
index 2119ca6a73bc9c5f0c43fd52796a3ad662ba4cd6..b9d6d4f92c034c461ee04af9f3632c6342feeb54 100644 (file)
--- a/arch/arm/mach-s3c24xx/simtec-nor.c
+++ b/arch/arm/mach-s3c24xx/simtec-nor.c
@@ -35,9 +35,7 @@
 static void simtec_nor_vpp(struct platform_device *pdev, int vpp)
 {
        unsigned int val;
-       unsigned long flags;
 
-       local_irq_save(flags);
        val = __raw_readb(BAST_VA_CTRL3);
 
        printk(KERN_DEBUG "%s(%d)\n", __func__, vpp);
@@ -48,7 +46,6 @@ static void simtec_nor_vpp(struct platform_device *pdev, int vpp)
                val &= ~BAST_CPLD_CTRL3_ROMWEN;
 
        __raw_writeb(val, BAST_VA_CTRL3);
-       local_irq_restore(flags);
 }
 
 static struct physmap_flash_data simtec_nor_pdata = {