Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits)
  genirq: Expand generic show_interrupts()
  gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler
  gpio: Cleanup genirq namespace
  arm: ep93xx: Add basic interrupt info
  arm/gpio: Remove three copies of broken and racy debug code
  xtensa: Use generic show_interrupts()
  xtensa: Convert genirq namespace
  xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED
  xtensa: Convert s6000 gpio irq_chip to new functions
  xtensa: Convert main irq_chip to new functions
  um: Use generic show_interrupts()
  um: Convert genirq namespace
  m32r: Use generic show_interrupts()
  m32r: Convert genirq namespace
  h8300: Use generic show_interrupts()
  h8300: Convert genirq namespace
  avr32: Cleanup eic_set_irq_type()
  avr32: Use generic show_interrupts()
  avr: Cleanup genirq namespace
  avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED
  ...

Fix up trivial conflict in drivers/gpio/timbgpio.c

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpio/vr41xx_giu.c b/drivers/gpio/vr41xx_giu.c
index cffa3bd7ad3b..a365be040b36 100644
--- a/drivers/gpio/vr41xx_giu.c
+++ b/drivers/gpio/vr41xx_giu.c
@@ -238,13 +238,13 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger,
                                         break;
                                 }
                         }
-                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                        irq_set_chip_and_handler(GIU_IRQ(pin),
                                                  &giuint_low_irq_chip,
                                                  handle_edge_irq);
                 } else {
                         giu_clear(GIUINTTYPL, mask);
                         giu_clear(GIUINTHTSELL, mask);
-                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                        irq_set_chip_and_handler(GIU_IRQ(pin),
                                                  &giuint_low_irq_chip,
                                                  handle_level_irq);
                 }
@@ -273,13 +273,13 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger,
                                         break;
                                 }
                         }
-                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                        irq_set_chip_and_handler(GIU_IRQ(pin),
                                                  &giuint_high_irq_chip,
                                                  handle_edge_irq);
                 } else {
                         giu_clear(GIUINTTYPH, mask);
                         giu_clear(GIUINTHTSELH, mask);
-                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                        irq_set_chip_and_handler(GIU_IRQ(pin),
                                                  &giuint_high_irq_chip,
                                                  handle_level_irq);
                 }
@@ -539,9 +539,9 @@ static int __devinit giu_probe(struct platform_device *pdev)
                         chip = &giuint_high_irq_chip;
 
                 if (trigger & (1 << pin))
-                        set_irq_chip_and_handler(i, chip, handle_edge_irq);
+                        irq_set_chip_and_handler(i, chip, handle_edge_irq);
                 else
-                        set_irq_chip_and_handler(i, chip, handle_level_irq);
+                        irq_set_chip_and_handler(i, chip, handle_level_irq);
 
         }