diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-11-14 18:15:32 +0000 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-11-14 18:15:32 +0000 |
| commit | b44959f2817032bc4668434bbe1cf9ab28b8cb21 (patch) | |
| tree | de3bd861b36c836ac9b7b6e8dc179ca1985b6593 /arch/arm/mach-pxa/lubbock.c | |
| parent | e22956a2faa9cf34cec4a471131d50c6be75b0c2 (diff) | |
| parent | 2216c9e74fb3baac3cb73952158dbe38b703997e (diff) | |
Conflicts:
drivers/gpu/drm/tdfx/tdfx_drv.c
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 6bb3f47b1f1..0ca0db78790 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, init_timer(&mmc_timer); mmc_timer.data = (unsigned long) data; return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int, - IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data); + 0, "lubbock-sd-detect", data); } static int lubbock_mci_get_ro(struct device *dev) |