Merge remote-tracking branch 'mmc/mmc-next'

[karo-tx-linux.git] / arch / arm / mach-at91 / at91sam9260_devices.c

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index db63bf55d26990c3bb07a3e8db8fce8dbf0fd605..24b6f8c0440ddc0c4b4661bc1bbf8b4f51c9b399 100644 (file)
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -327,7 +327,7 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
        if (!data)
                return;
 
-       for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
+       for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
                if (data->slot[i].bus_width) {
                        /* input/irq */
                        if (data->slot[i].detect_pin) {