Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix shared mmap when more than two maps of the same file exist
  [ARM] fix VIPT/VIVT macro optimisations, add comments
  [ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
  [ARM] update defconfig for eseries.
  [ARM] PXA: squash warning in pxafb
  [ARM] pxa: PXA25x UDC - Fix warning during build
  [ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26
  [ARM] fix IOP32x, IOP33x, MXC and Samsung builds
  [ARM] pci: provide dummy pci_get_legacy_ide_irq()
  [ARM] fix fls() for 64-bit arguments
  [ARM] fix mode for board-yl-9200.c
  [ARM] 5176/1: arm/Makefile: fix: ARM946T -> ARM946E

10 files changed, 26 insertions, 26 deletions

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index de8d186f5abf..2014253f6c88 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -169,7 +169,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq)
-                set_irq_type(irq, IRQT_RISING);
+                set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
 
         /* Setup expansion bus chip selects */
         *data->cs0_cfg = data->cs0_bits;
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index f9f72a211292..006be92ee3f3 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size,
         ssize_t ret;
 
         if (flashdebug)
-                printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, "
-                       "buffer=%p, count=0x%X.\n", p, buf, count);
+                printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, "
+                       "buffer=%p, count=0x%zx.\n", *ppos, buf, size);
         /*
          * We now lock against reads and writes. --rmk
          */
         if (mutex_lock_interruptible(&nwflash_mutex))
                 return -ERESTARTSYS;
 
-        ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize);
+        ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize);
         mutex_unlock(&nwflash_mutex);
 
         return ret;
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 4e9d8eece2e0..d0e13fc4a88c 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -195,7 +195,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
 {
         if ((GPLR(IRQ_TO_GPIO(corgi_ts->irq_gpio)) & GPIO_bit(IRQ_TO_GPIO(corgi_ts->irq_gpio))) == 0) {
                 /* Disable Interrupt */
-                set_irq_type(corgi_ts->irq_gpio, IRQT_NOEDGE);
+                set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_NONE);
                 if (read_xydata(corgi_ts)) {
                         corgi_ts->pendown = 1;
                         new_data(corgi_ts);
@@ -214,7 +214,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
                 }
 
                 /* Enable Falling Edge */
-                set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+                set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING);
                 corgi_ts->pendown = 0;
         }
 }
@@ -258,7 +258,7 @@ static int corgits_resume(struct platform_device *dev)
 
         corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
         /* Enable Falling Edge */
-        set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+        set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING);
         corgi_ts->power_mode = PWR_MODE_ACTIVE;
 
         return 0;
@@ -333,7 +333,7 @@ static int __init corgits_probe(struct platform_device *pdev)
         corgi_ts->power_mode = PWR_MODE_ACTIVE;
 
         /* Enable Falling Edge */
-        set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+        set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING);
 
         return 0;
 
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index a79f029b91c0..590a1379aa32 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -198,7 +198,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm)
                 switch (wm->id) {
                 case WM9705_ID2:
                         wm->pen_irq = IRQ_GPIO(4);
-                        set_irq_type(IRQ_GPIO(4), IRQT_BOTHEDGE);
+                        set_irq_type(IRQ_GPIO(4), IRQ_TYPE_EDGE_BOTH);
                         break;
                 case WM9712_ID2:
                 case WM9713_ID2:
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index eabf0bfccab4..c6408a62d95e 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -256,28 +256,28 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
                                       bank + ASIC3_GPIO_TRIGGER_TYPE);
         asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit;
 
-        if (type == IRQT_RISING) {
+        if (type == IRQ_TYPE_EDGE_RISING) {
                 trigger |= bit;
                 edge |= bit;
-        } else if (type == IRQT_FALLING) {
+        } else if (type == IRQ_TYPE_EDGE_FALLING) {
                 trigger |= bit;
                 edge &= ~bit;
-        } else if (type == IRQT_BOTHEDGE) {
+        } else if (type == IRQ_TYPE_EDGE_BOTH) {
                 trigger |= bit;
                 if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base))
                         edge &= ~bit;
                 else
                         edge |= bit;
                 asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit;
-        } else if (type == IRQT_LOW) {
+        } else if (type == IRQ_TYPE_LEVEL_LOW) {
                 trigger &= ~bit;
                 level &= ~bit;
-        } else if (type == IRQT_HIGH) {
+        } else if (type == IRQ_TYPE_LEVEL_HIGH) {
                 trigger &= ~bit;
                 level |= bit;
         } else {
                 /*
-                 * if type == IRQT_NOEDGE, we should mask interrupts, but
+                 * if type == IRQ_TYPE_NONE, we should mask interrupts, but
                  * be careful to not unmask them if mask was also called.
                  * Probably need internal state for mask.
                  */
@@ -343,7 +343,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
                              ASIC3_INTMASK_GINTMASK);
 
         set_irq_chained_handler(asic->irq_nr, asic3_irq_demux);
-        set_irq_type(asic->irq_nr, IRQT_RISING);
+        set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
         set_irq_data(asic->irq_nr, asic);
 
         return 0;
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 2d87501b6fd4..94e55e8e7ce6 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -324,7 +324,7 @@ static void tc6393xb_attach_irq(struct platform_device *dev)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        set_irq_type(tc6393xb->irq, IRQT_FALLING);
+        set_irq_type(tc6393xb->irq, IRQ_TYPE_EDGE_FALLING);
         set_irq_data(tc6393xb->irq, tc6393xb);
         set_irq_chained_handler(tc6393xb->irq, tc6393xb_irq);
 }
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 420a77540f41..8c21446996f2 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -149,10 +149,10 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t *stat
                  */
                 if (skt->irq_state != 1 && state->io_irq) {
                         skt->irq_state = 1;
-                        set_irq_type(skt->irq, IRQT_FALLING);
+                        set_irq_type(skt->irq, IRQ_TYPE_EDGE_FALLING);
                 } else if (skt->irq_state == 1 && state->io_irq == 0) {
                         skt->irq_state = 0;
-                        set_irq_type(skt->irq, IRQT_NOEDGE);
+                        set_irq_type(skt->irq, IRQ_TYPE_NONE);
                 }
 
                 skt->cs_state = *state;
@@ -527,7 +527,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,
                                   IRQF_DISABLED, irqs[i].str, skt);
                 if (res)
                         break;
-                set_irq_type(irqs[i].irq, IRQT_NOEDGE);
+                set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
         }
 
         if (res) {
@@ -560,7 +560,7 @@ void soc_pcmcia_disable_irqs(struct soc_pcmcia_socket *skt,
 
         for (i = 0; i < nr; i++)
                 if (irqs[i].sock == skt->nr)
-                        set_irq_type(irqs[i].irq, IRQT_NOEDGE);
+                        set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
 }
 EXPORT_SYMBOL(soc_pcmcia_disable_irqs);
 
@@ -571,8 +571,8 @@ void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt,
 
         for (i = 0; i < nr; i++)
                 if (irqs[i].sock == skt->nr) {
-                        set_irq_type(irqs[i].irq, IRQT_RISING);
-                        set_irq_type(irqs[i].irq, IRQT_BOTHEDGE);
+                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING);
+                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH);
                 }
 }
 EXPORT_SYMBOL(soc_pcmcia_enable_irqs);
diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c
index 51e26c1f5e8b..32dd85126931 100644
--- a/drivers/video/am200epd.c
+++ b/drivers/video/am200epd.c
@@ -221,7 +221,7 @@ static int am200_setup_irq(struct fb_info *info)
                 return retval;
         }
 
-        return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+        return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQ_TYPE_EDGE_FALLING);
 }
 
 static void am200_set_rst(struct metronomefb_par *par, int state)
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 81dbcf53cf0e..fafd0f26b90f 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -646,7 +646,7 @@ static int sossi_init(struct omapfb_device *fbdev)
         sossi_write_reg(SOSSI_INIT1_REG, l);
 
         if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq,
-                             IRQT_FALLING,
+                             IRQ_TYPE_EDGE_FALLING,
              "sossi_match", sossi.fbdev->dev)) < 0) {
                 dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n");
                 goto err;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 2b707a8ce5de..69de2fed6c58 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1336,7 +1336,7 @@ static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
                 fbi->dma_buff_phys = fbi->map_dma;
                 fbi->palette_cpu = (u16 *) fbi->dma_buff->palette;
 
-                pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16));
+                pr_debug("pxafb: palette_mem_size = 0x%08x\n", fbi->palette_size*sizeof(u16));
 
 #ifdef CONFIG_FB_PXA_SMARTPANEL
                 fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff;