Merge branch 'fixes-2.6.39' into for-2.6.40

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpio/max732x.c b/drivers/gpio/max732x.c
index 9e1d01f0071..ad6951edc16 100644
--- a/drivers/gpio/max732x.c
+++ b/drivers/gpio/max732x.c
@@ -470,14 +470,14 @@ static int max732x_irq_setup(struct max732x_chip *chip,
                         if (!(chip->dir_input & (1 << lvl)))
                                 continue;
 
-                        set_irq_chip_data(irq, chip);
-                        set_irq_chip_and_handler(irq, &max732x_irq_chip,
+                        irq_set_chip_data(irq, chip);
+                        irq_set_chip_and_handler(irq, &max732x_irq_chip,
                                                  handle_edge_irq);
-                        set_irq_nested_thread(irq, 1);
+                        irq_set_nested_thread(irq, 1);
 #ifdef CONFIG_ARM
                         set_irq_flags(irq, IRQF_VALID);
 #else
-                        set_irq_noprobe(irq);
+                        irq_set_noprobe(irq);
 #endif
                 }