gistfile1.diff

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmo
index a570b40..a2c0d95 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -128,6 +128,7 @@ static struct platform_device __maybe_unused usb_func_device
        .resource       = usb_resources,
 };

+#ifdef CONFIG_MMC
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
        gpio_set_value(GPIO_PORT107, state);
@@ -304,6 +305,7 @@ static struct platform_device sh_mmcif_device = {
        .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
        .resource       = sh_mmcif_resources,
 };
+#endif /* CONFIG_MMC */

 static struct sh_fsi_dma sh_fsi2_dma = {
        .dma_porta_tx = {
@@ -1044,9 +1046,11 @@ static struct platform_device gpio_led = {

 static struct platform_device *rma1evb_devices[] __initdata = {
        &eth_device,
+#ifdef CONFIG_MMC
        &sh_mmcif_device,
        &sdhi0_device,
        &sdhi1_device,
+#endif
        //&usb_func_device,
        &ohci_device,
        &ehci_device,