From 9a5749dfc194563f2ed92fa68c9e46e55f37739d Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Mon, 22 Feb 2010 13:37:09 +0900
Subject: [PATCH] --- yaml --- r: 186927 b: refs/heads/master c:
 3c49e810507c9d0659b8aa61f7f91aecda428ee3 h: refs/heads/master i:   186925:
 78c941176d9dbc800b7201a599053d7753c97b5c   186923:
 3877c864855061a4c0bcec6a1ae4a05439083b33   186919:
 81274acce6356ec53208223bc00c39c881a085db   186911:
 b5a1f54cf1b02c3e48ca62304986d670df4b1941 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mfd/sh_mobile_sdhi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7d1905ed4f78..1b8c0c0e8098 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bca748cccec1c7f30b4424882de965100744432
+refs/heads/master: 3c49e810507c9d0659b8aa61f7f91aecda428ee3
diff --git a/trunk/drivers/mfd/sh_mobile_sdhi.c b/trunk/drivers/mfd/sh_mobile_sdhi.c
index 03efae8041ab..468fd366d4da 100644
--- a/trunk/drivers/mfd/sh_mobile_sdhi.c
+++ b/trunk/drivers/mfd/sh_mobile_sdhi.c
@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
-
+#include <linux/mmc/host.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tmio.h>
 #include <linux/mfd/sh_mobile_sdhi.h>
@@ -95,9 +95,9 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
 
 	clk_enable(priv->clk);
 
-	/* FIXME: silly const unsigned int hclk */
-	*(unsigned int *)&priv->mmc_data.hclk = clk_get_rate(priv->clk);
+	priv->mmc_data.hclk = clk_get_rate(priv->clk);
 	priv->mmc_data.set_pwr = sh_mobile_sdhi_set_pwr;
+	priv->mmc_data.capabilities = MMC_CAP_MMC_HIGHSPEED;
 
 	memcpy(&priv->cell_mmc, &sh_mobile_sdhi_cell, sizeof(priv->cell_mmc));
 	priv->cell_mmc.driver_data = &priv->mmc_data;