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

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c
index 4c3ab43e1046..0b06941a1eed 100644
--- a/arch/arm/mach-ks8695/irq.c
+++ b/arch/arm/mach-ks8695/irq.c
@@ -72,21 +72,21 @@ static int ks8695_irq_set_type(unsigned int irqno, unsigned int type)
         ctrl = __raw_readl(KS8695_GPIO_VA + KS8695_IOPC);
 
         switch (type) {
-                case IRQT_HIGH:
+                case IRQ_TYPE_LEVEL_HIGH:
                         mode = IOPC_TM_HIGH;
                         level_triggered = 1;
                         break;
-                case IRQT_LOW:
+                case IRQ_TYPE_LEVEL_LOW:
                         mode = IOPC_TM_LOW;
                         level_triggered = 1;
                         break;
-                case IRQT_RISING:
+                case IRQ_TYPE_EDGE_RISING:
                         mode = IOPC_TM_RISING;
                         break;
-                case IRQT_FALLING:
+                case IRQ_TYPE_EDGE_FALLING:
                         mode = IOPC_TM_FALLING;
                         break;
-                case IRQT_BOTHEDGE:
+                case IRQ_TYPE_EDGE_BOTH:
                         mode = IOPC_TM_EDGE;
                         break;
                 default: