diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:40:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:40:39 -0400 |
| commit | ebdea46fecae40c4d7effcd33f40918a37a1df4b (patch) | |
| tree | e4312bf7f1f3d184738963a0ec300aa9fdfd55c1 /drivers/mmc | |
| parent | fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (diff) | |
| parent | 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
[ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
[ARM] 3855/1: Add generic time support
[ARM] 3873/1: S3C24XX: Add irq_chip names
[ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
[ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
[ARM] nommu: confirms the CR_V bit in nommu mode
[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
[ARM] 3870/1: AT91: Start removing static memory mappings
[ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
[ARM] 3868/1: AT91 hardware header update
[ARM] 3867/1: AT91 GPIO update
[ARM] 3866/1: AT91 clock update
[ARM] 3865/1: AT91RM9200 header updates
[ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
[ARM] kthread: switch arch/arm/kernel/apm.c
[ARM] Off-by-one in arch/arm/common/icst*
[ARM] 3864/1: Refactore sharpsl_pm
[ARM] 3863/1: Add Locomo SPI Device
[ARM] 3847/2: Convert LOMOMO to use struct device for GPIOs
[ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
...
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/at91_mci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c index d34b7d9d92e..cb142a66098 100644 --- a/drivers/mmc/at91_mci.c +++ b/drivers/mmc/at91_mci.c | |||
| @@ -851,7 +851,7 @@ static int at91_mci_probe(struct platform_device *pdev) | |||
| 851 | /* | 851 | /* |
| 852 | * Allocate the MCI interrupt | 852 | * Allocate the MCI interrupt |
| 853 | */ | 853 | */ |
| 854 | ret = request_irq(AT91_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); | 854 | ret = request_irq(AT91RM9200_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); |
| 855 | if (ret) { | 855 | if (ret) { |
| 856 | printk(KERN_ERR "Failed to request MCI interrupt\n"); | 856 | printk(KERN_ERR "Failed to request MCI interrupt\n"); |
| 857 | clk_disable(mci_clk); | 857 | clk_disable(mci_clk); |
| @@ -907,7 +907,7 @@ static int at91_mci_remove(struct platform_device *pdev) | |||
| 907 | 907 | ||
| 908 | mmc_remove_host(mmc); | 908 | mmc_remove_host(mmc); |
| 909 | at91_mci_disable(); | 909 | at91_mci_disable(); |
| 910 | free_irq(AT91_ID_MCI, host); | 910 | free_irq(AT91RM9200_ID_MCI, host); |
| 911 | mmc_free_host(mmc); | 911 | mmc_free_host(mmc); |
| 912 | 912 | ||
| 913 | clk_disable(mci_clk); /* Disable the peripheral clock */ | 913 | clk_disable(mci_clk); /* Disable the peripheral clock */ |