From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 03:23:06 +0000 (+1100)
Subject: Merge remote-tracking branch 'mmc/mmc-next'
X-Git-Tag: next-20111004~43
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a1817899c9409a8e7beea5a51cfa8b3e1266e5a7;p=karo-tx-linux.git

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

Conflicts:
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c
---

a1817899c9409a8e7beea5a51cfa8b3e1266e5a7
diff --cc arch/arm/mach-at91/at91sam9260_devices.c
index 7f570b5b2a09,c49e84a39a6f..6bfcd484d434
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@@ -327,10 -319,10 +327,10 @@@ void __init at91_add_device_mci(short m
  	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) {
 +			if (gpio_is_valid(data->slot[i].detect_pin)) {
  				at91_set_gpio_input(data->slot[i].detect_pin, 1);
  				at91_set_deglitch(data->slot[i].detect_pin, 1);
  			}