diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/arm/mach-pxa/lubbock.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
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 ee80d62119d3..142c33c3dff5 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
| @@ -397,7 +397,7 @@ static void lubbock_mmc_poll(unsigned long data) | |||
| 397 | if (LUB_IRQ_SET_CLR & (1 << 0)) | 397 | if (LUB_IRQ_SET_CLR & (1 << 0)) |
| 398 | mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE); | 398 | mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE); |
| 399 | else { | 399 | else { |
| 400 | (void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data, NULL); | 400 | (void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data); |
| 401 | enable_irq(LUBBOCK_SD_IRQ); | 401 | enable_irq(LUBBOCK_SD_IRQ); |
| 402 | } | 402 | } |
| 403 | } | 403 | } |