diff options
| author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-04 07:04:39 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-10-21 09:11:05 +0800 |
| commit | 4c1dd3e5edc1619199b4a42618169ac3ac457cb5 (patch) | |
| tree | 8a9f18cef8de7bed8a22ae0d934f30d586462655 /arch/arm/mach-imx/mach-mx31_3ds.c | |
| parent | a9aec30dcf2aae5929bc43ada552a33c8d737967 (diff) | |
| download | talos-op-linux-4c1dd3e5edc1619199b4a42618169ac3ac457cb5.tar.gz talos-op-linux-4c1dd3e5edc1619199b4a42618169ac3ac457cb5.zip | |
ARM: imx: remove IRQF_DISABLED
This flag is a NOOP since 2.6.35 and can be removed.
This is an update for 3.11 of a patch already sent for 3.10
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 1ed916175d41..50044a21b388 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c @@ -311,7 +311,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev, } ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)), - detect_irq, IRQF_DISABLED | + detect_irq, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "sdhc1-detect", data); if (ret) { |
