aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-11-19 22:31:03 +0800
committerNicolas Ferre <nicolas.ferre@atmel.com>2010-11-30 17:21:55 +0100
commit8e79d2d4e7147eb6dfd075d7cb200c666566a9e0 (patch)
tree51bb19e73dbfe6427b6edeb5660bf28004595b7f
parentat91: Convert remaining boards to new-style UART initialization (diff)
downloadlinux-dev-8e79d2d4e7147eb6dfd075d7cb200c666566a9e0.tar.xz
linux-dev-8e79d2d4e7147eb6dfd075d7cb200c666566a9e0.zip
at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Andrew Victor <linux@maxim.org.za>
-rw-r--r--arch/arm/mach-at91/board-dk.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/board-dk.c b/arch/arm/mach-at91/board-dk.c
index e14f0e165680..16dfd0c38472 100644
--- a/arch/arm/mach-at91/board-dk.c
+++ b/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 */