diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-09-27 04:44:11 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-28 06:52:05 -0400 |
commit | 72729910c38ca5b4736032c15dc3f9d48fe4f68a (patch) | |
tree | e7461ec8e0ff07d1634d7d7a467cb8454135a5c8 /drivers/mmc/at91_mci.c | |
parent | 26f908186f923291999833e9d563259834bdca06 (diff) |
[ARM] 3865/1: AT91RM9200 header updates
This is more preparation for adding support for the new Atmel AT91SAM9
processors.
Changes include:
- Replace AT91_BASE_* with AT91RM9200_BASE_*
- Replace AT91_ID_* with AT91RM9200_ID_*
- ROM, SRAM and UHP address definitions moved to at91rm9200.h.
- The raw AT91_P[ABCD]_* definitions are now depreciated in favour of
the GPIO API.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/at91_mci.c')
-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 6b7638b84290..4b3d4d637030 100644 --- a/drivers/mmc/at91_mci.c +++ b/drivers/mmc/at91_mci.c | |||
@@ -850,7 +850,7 @@ static int at91_mci_probe(struct platform_device *pdev) | |||
850 | /* | 850 | /* |
851 | * Allocate the MCI interrupt | 851 | * Allocate the MCI interrupt |
852 | */ | 852 | */ |
853 | ret = request_irq(AT91_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); | 853 | ret = request_irq(AT91RM9200_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); |
854 | if (ret) { | 854 | if (ret) { |
855 | printk(KERN_ERR "Failed to request MCI interrupt\n"); | 855 | printk(KERN_ERR "Failed to request MCI interrupt\n"); |
856 | clk_disable(mci_clk); | 856 | clk_disable(mci_clk); |
@@ -906,7 +906,7 @@ static int at91_mci_remove(struct platform_device *pdev) | |||
906 | 906 | ||
907 | mmc_remove_host(mmc); | 907 | mmc_remove_host(mmc); |
908 | at91_mci_disable(); | 908 | at91_mci_disable(); |
909 | free_irq(AT91_ID_MCI, host); | 909 | free_irq(AT91RM9200_ID_MCI, host); |
910 | mmc_free_host(mmc); | 910 | mmc_free_host(mmc); |
911 | 911 | ||
912 | clk_disable(mci_clk); /* Disable the peripheral clock */ | 912 | clk_disable(mci_clk); /* Disable the peripheral clock */ |