From eefd2280e29cb154d690d4442ad2a61380c72286 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 14:17:04 -0700
Subject: [PATCH] --- yaml --- r: 331387 b: refs/heads/master c:
 30411c2cad86bac4736589b116c7234c33ceec8f h: refs/heads/master i:   331385:
 4f7c89548be158ca8be1db4db61cff2881454a72   331383:
 ccbee5419969c6230374e05499ef38b2dab26f75 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-kirkwood/board-dockstar.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 52f1809ef20e..f4f4981f2575 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b014487044161b83010a9cbe336dbc41d2c38a0b
+refs/heads/master: 30411c2cad86bac4736589b116c7234c33ceec8f
diff --git a/trunk/arch/arm/mach-kirkwood/board-dockstar.c b/trunk/arch/arm/mach-kirkwood/board-dockstar.c
index 6beff21b4a0d..f2fbb023e679 100644
--- a/trunk/arch/arm/mach-kirkwood/board-dockstar.c
+++ b/trunk/arch/arm/mach-kirkwood/board-dockstar.c
@@ -30,7 +30,7 @@
 #include <asm/mach/map.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"