From c0ccf7c81ea96b50c1882a92ef9f2a248a2aac38 Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Wed, 31 Jan 2007 11:09:08 -0800 Subject: [PATCH] ARM: OMAP: Convert interrupt flags SA_* to IRQF_* Convert interrupt flags SA_* to IRQF_* Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/plat-omap/gpio-switch.c | 8 ++++---- arch/arm/plat-omap/mailbox.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) Index: linux-omap-upstream/arch/arm/mach-omap1/board-palmz71.c =================================================================== --- linux-omap-upstream.orig/arch/arm/mach-omap1/board-palmz71.c 2007-02-13 13:06:27.000000000 -0800 +++ linux-omap-upstream/arch/arm/mach-omap1/board-palmz71.c 2007-02-13 13:06:34.000000000 -0800 @@ -342,7 +342,7 @@ palmz71_gpio_setup(int early) } omap_set_gpio_direction(PALMZ71_USBDETECT_GPIO, 1); if (request_irq(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), - palmz71_powercable, SA_SAMPLE_RANDOM, + palmz71_powercable, IRQF_SAMPLE_RANDOM, "palmz71-cable", 0)) printk(KERN_ERR "IRQ request for power cable failed!\n"); Index: linux-omap-upstream/arch/arm/plat-omap/mailbox.c =================================================================== --- linux-omap-upstream.orig/arch/arm/plat-omap/mailbox.c 2007-02-13 13:06:24.000000000 -0800 +++ linux-omap-upstream/arch/arm/plat-omap/mailbox.c 2007-02-13 13:06:34.000000000 -0800 @@ -247,7 +247,7 @@ static int omap_mbox_init(struct omap_mb if (unlikely(ret)) goto fail2; - ret = request_irq(mbox->irq, mbox_interrupt, SA_INTERRUPT, + ret = request_irq(mbox->irq, mbox_interrupt, IRQF_DISABLED, mbox->name, mbox); if (unlikely(ret)) { printk(KERN_ERR