From 56b7ff3281d133e4c6ae1eca97b43f8e998cddd7 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Fri, 19 Nov 2010 22:31:03 +0800
Subject: [PATCH] --- yaml --- r: 222731 b: refs/heads/master c:
 8e79d2d4e7147eb6dfd075d7cb200c666566a9e0 h: refs/heads/master i:   222729:
 39678a53ddd0601fe8df57f9d3df7e2a72cb7690   222727:
 3ee682035f4aafdbf01af38453cb6ab18c2a0d37 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-at91/board-dk.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 48f7cd5dcb6d..ca62939194f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae8cd978bc773e916e0b51a76fe3f096fa31069
+refs/heads/master: 8e79d2d4e7147eb6dfd075d7cb200c666566a9e0
diff --git a/trunk/arch/arm/mach-at91/board-dk.c b/trunk/arch/arm/mach-at91/board-dk.c
index e14f0e165680..16dfd0c38472 100644
--- a/trunk/arch/arm/mach-at91/board-dk.c
+++ b/trunk/arch/arm/mach-at91/board-dk.c
@@ -91,10 +91,12 @@ static struct at91_cf_data __initdata dk_cf_data = {
 	// .vcc_pin	= ... always powered
 };
 
+#ifndef CONFIG_MTD_AT91_DATAFLASH_CARD
 static struct at91_mmc_data __initdata dk_mmc_data = {
 	.slot_b		= 0,
 	.wire4		= 1,
 };
+#endif
 
 static struct spi_board_info dk_spi_devices[] = {
 	{	/* DataFlash chip */