Merge commit 'v2.6.27-rc1' into x86/urgent

12 files changed, 42 insertions, 42 deletions

diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
index 3f867691d9f..c6e044befcc 100644
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -30,10 +30,10 @@
 
 void __init avila_pci_preinit(void)
 {
-        set_irq_type(IRQ_AVILA_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_AVILA_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_AVILA_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_AVILA_PCI_INTD, IRQT_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 3781b3db9f4..3947c506b4f 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -142,23 +142,23 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
                 return -EINVAL;
 
         switch (type){
-        case IRQT_BOTHEDGE:
+        case IRQ_TYPE_EDGE_BOTH:
                 int_style = IXP4XX_GPIO_STYLE_TRANSITIONAL;
                 irq_type = IXP4XX_IRQ_EDGE;
                 break;
-        case IRQT_RISING:
+        case IRQ_TYPE_EDGE_RISING:
                 int_style = IXP4XX_GPIO_STYLE_RISING_EDGE;
                 irq_type = IXP4XX_IRQ_EDGE;
                 break;
-        case IRQT_FALLING:
+        case IRQ_TYPE_EDGE_FALLING:
                 int_style = IXP4XX_GPIO_STYLE_FALLING_EDGE;
                 irq_type = IXP4XX_IRQ_EDGE;
                 break;
-        case IRQT_HIGH:
+        case IRQ_TYPE_LEVEL_HIGH:
                 int_style = IXP4XX_GPIO_STYLE_ACTIVE_HIGH;
                 irq_type = IXP4XX_IRQ_LEVEL;
                 break;
-        case IRQT_LOW:
+        case IRQ_TYPE_LEVEL_LOW:
                 int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
                 irq_type = IXP4XX_IRQ_LEVEL;
                 break;
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index ad2e5b97966..be4f4a208b9 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -27,8 +27,8 @@
 
 void __init coyote_pci_preinit(void)
 {
-        set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQT_LOW);
-        set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQT_LOW);
+        set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c
index 9db7e1f4201..926d15f885f 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-pci.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-pci.c
@@ -25,12 +25,12 @@
 
 void __init dsmg600_pci_preinit(void)
 {
-        set_irq_type(IRQ_DSMG600_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTD, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTE, IRQT_LOW);
-        set_irq_type(IRQ_DSMG600_PCI_INTF, IRQT_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTE, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_DSMG600_PCI_INTF, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
index f19f3f6feda..ca12a9ca083 100644
--- a/arch/arm/mach-ixp4xx/fsg-pci.c
+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -25,9 +25,9 @@
 
 void __init fsg_pci_preinit(void)
 {
-        set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW);
+        set_irq_type(IRQ_FSG_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_FSG_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_FSG_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c
index 6abf568322d..afd1dc14e59 100644
--- a/arch/arm/mach-ixp4xx/gateway7001-pci.c
+++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -29,8 +29,8 @@
 
 void __init gateway7001_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW);
-        set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index 49dec786880..20960704183 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -41,10 +41,10 @@
  */
 void __init gtwx5715_pci_preinit(void)
 {
-        set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQT_LOW);
-        set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQT_LOW);
-        set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQT_LOW);
-        set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQT_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT0_INTA_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT0_INTB_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT1_INTA_IRQ, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(GTWX5715_PCI_SLOT1_INTB_IRQ, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index 40879600481..7d9bb4d2310 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -27,10 +27,10 @@
 
 void __init ixdp425_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXDP425_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_IXDP425_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_IXDP425_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_IXDP425_PCI_INTD, IRQT_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXDP425_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index d1e75b7dc3b..37d9f2e8f60 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -25,8 +25,8 @@
 
 void __init ixdpg425_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
-        set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO6, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO7, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index b8ebaf4a9c8..1088426fdce 100644
--- a/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -24,11 +24,11 @@
 
 void __init nas100d_pci_preinit(void)
 {
-        set_irq_type(IRQ_NAS100D_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTC, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW);
-        set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTD, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NAS100D_PCI_INTE, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
index 04661fef97f..4429b8448b6 100644
--- a/arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -24,9 +24,9 @@
 
 void __init nslu2_pci_preinit(void)
 {
-        set_irq_type(IRQ_NSLU2_PCI_INTA, IRQT_LOW);
-        set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW);
-        set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW);
+        set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NSLU2_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_NSLU2_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c
index 6588f2c758e..0f00feab67f 100644
--- a/arch/arm/mach-ixp4xx/wg302v2-pci.c
+++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -29,8 +29,8 @@
 
 void __init wg302v2_pci_preinit(void)
 {
-        set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW);
-        set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW);
 
         ixp4xx_pci_preinit();
 }