From patchwork Fri Mar 11 07:52:28 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
X-Patchwork-Id: 627581
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2B7qEDE019059
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Fri, 11 Mar 2011 07:52:34 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753180Ab1CKHwd (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Fri, 11 Mar 2011 02:52:33 -0500
Received: from moutng.kundenserver.de ([212.227.126.171]:49615 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751230Ab1CKHwd (ORCPT
	<rfc822; linux-mmc@vger.kernel.org>); Fri, 11 Mar 2011 02:52:33 -0500
Received: from axis700.grange (pD9EB8C3C.dip0.t-ipconnect.de
	[217.235.140.60])
	by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis)
	id 0LtDGF-1Q4fQ72ABf-012I5P; Fri, 11 Mar 2011 08:52:28 +0100
Received: by axis700.grange (Postfix, from userid 1000)
	id 2EA0F189B86; Fri, 11 Mar 2011 08:52:28 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
	by axis700.grange (Postfix) with ESMTP id 2C702189B85;
	Fri, 11 Mar 2011 08:52:28 +0100 (CET)
Date: Fri, 11 Mar 2011 08:52:28 +0100 (CET)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
X-X-Sender: lyakh@axis700.grange
To: linux-sh@vger.kernel.org
cc: linux-mmc@vger.kernel.org, Chris Ball <cjb@laptop.org>,
	Ian Molton <ian@mnementh.co.uk>
Subject: [PATCH 4/6] ARM: mach-shmobile: convert boards to use
	linux/mmc/sh_mobile_sdhi.h
In-Reply-To: <Pine.LNX.4.64.1103110831510.23675@axis700.grange>
Message-ID: <Pine.LNX.4.64.1103110846390.23675@axis700.grange>
References: <Pine.LNX.4.64.1103110831510.23675@axis700.grange>
MIME-Version: 1.0
X-Provags-ID: V02:K0:3St4Pc0sbO+KvMBbmtgDmU/A/gr8NOudkljNNcNdziC
	Sb6ZTDoPuRWASoC8tzVaMPZGMXpGfCZ7ivqN3X2hCXG6Y/N3yn
	gi/4B/8tcsFeNSukH9UthdgDqvzLTUz2v5+mFlsohmaxaZn9RZ
	MNtWMSjhe8toJKA0sKPHseBeZhl26qX1HT6TtoJZz5A4W19GuJ
	zpDc6w3ofZWD9Q9a8ocQHjjgFK4g+jQG/yBKxxPDtU=
Sender: linux-mmc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-mmc.vger.kernel.org>
X-Mailing-List: linux-mmc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Fri, 11 Mar 2011 07:52:34 +0000 (UTC)


diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 1a8118c..7ae9e3b 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -24,9 +24,9 @@
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
 #include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c
index dee3e92..cccdf2d 100644
--- a/arch/arm/mach-shmobile/board-g4evm.c
+++ b/arch/arm/mach-shmobile/board-g4evm.c
@@ -31,7 +31,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/mmc/host.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/gpio.h>
 #include <mach/sh7377.h>
 #include <mach/common.h>
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index bbfc167..05fc5ac 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -32,10 +32,10 @@
 #include <linux/io.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>