---

yaml --- r: 222731 b: refs/heads/master c: 8e79d2d h: refs/heads/master i: 222729: 39678a5 222727: 3ee6820 v: v3
git-mirror · Nov 30, 2010 · 56b7ff3 · 56b7ff3
1 parent 64ac58f
commit 56b7ff3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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 */