diff options
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 6bb3f47b1f14..0ca0db787903 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
| @@ -456,7 +456,7 @@ static int lubbock_mci_init(struct device *dev, | |||
| 456 | init_timer(&mmc_timer); | 456 | init_timer(&mmc_timer); |
| 457 | mmc_timer.data = (unsigned long) data; | 457 | mmc_timer.data = (unsigned long) data; |
| 458 | return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int, | 458 | return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int, |
| 459 | IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data); | 459 | 0, "lubbock-sd-detect", data); |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | static int lubbock_mci_get_ro(struct device *dev) | 462 | static int lubbock_mci_get_ro(struct device *dev) |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 2db697cd2b4e..39561dcf65f2 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
| @@ -633,9 +633,8 @@ static struct platform_device bq24022 = { | |||
| 633 | static int magician_mci_init(struct device *dev, | 633 | static int magician_mci_init(struct device *dev, |
| 634 | irq_handler_t detect_irq, void *data) | 634 | irq_handler_t detect_irq, void *data) |
| 635 | { | 635 | { |
| 636 | return request_irq(IRQ_MAGICIAN_SD, detect_irq, | 636 | return request_irq(IRQ_MAGICIAN_SD, detect_irq, IRQF_DISABLED, |
| 637 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, | 637 | "mmc card detect", data); |
| 638 | "mmc card detect", data); | ||
| 639 | } | 638 | } |
| 640 | 639 | ||
| 641 | static void magician_mci_exit(struct device *dev, void *data) | 640 | static void magician_mci_exit(struct device *dev, void *data) |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 2b6ac00b2cd9..166dd32cc1d3 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
| @@ -332,8 +332,8 @@ static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int, | |||
| 332 | int err; | 332 | int err; |
| 333 | 333 | ||
| 334 | err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int, | 334 | err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int, |
| 335 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SAMPLE_RANDOM, | 335 | IRQF_DISABLED | IRQF_TRIGGER_RISING, |
| 336 | "MMC card detect", data); | 336 | "MMC card detect", data); |
| 337 | if (err) { | 337 | if (err) { |
| 338 | printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request" | 338 | printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request" |
| 339 | "MMC card detect IRQ\n"); | 339 | "MMC card detect IRQ\n"); |
