From 5676b3efe97067a5c9d35fce1402617e76a07946 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 12 Dec 2011 16:36:13 +0100
Subject: [PATCH] --- yaml --- r: 294271 b: refs/heads/master c:
 d81d5fa8adfb0ba19f44bb6c4c04a2a23effac3f h: refs/heads/master i:   294269:
 40d0b102bcc85f8e8ac19d864b0d02835054bf1c   294267:
 3d36aca9cdc8a1636b78e42a53e03e133ee989a5   294263:
 e757f4a7a83e2bacc18f0dca826a58d010f65efd   294255:
 d0967fb5094d3fdd3bb3f6d9157fc390117f91c5   294239:
 ed58daf276d220cead6daf81e75557f120b0a09f   294207:
 fa37e12228937ba0472a508fe73d727bbdb7b55a   294143:
 518a0c174c3a37ad39547b51688bce88f18b71d6 v: v3

---
 [refs]                                | 2 +-
 trunk/include/video/sh_mobile_meram.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b40fff5c4fa3..3a0319ee9e28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0a49d98fa4315c17a098cb60ccc626645ed9756
+refs/heads/master: d81d5fa8adfb0ba19f44bb6c4c04a2a23effac3f
diff --git a/trunk/include/video/sh_mobile_meram.h b/trunk/include/video/sh_mobile_meram.h
index e0f650c843c7..897960733cc0 100644
--- a/trunk/include/video/sh_mobile_meram.h
+++ b/trunk/include/video/sh_mobile_meram.h
@@ -31,8 +31,6 @@ struct sh_mobile_meram_info {
 
 /* icb config */
 struct sh_mobile_meram_icb_cfg {
-	unsigned int marker_icb;	/* ICB # for Marker ICB */
-	unsigned int cache_icb;		/* ICB # for Cache ICB */
 	unsigned int meram_size;	/* MERAM Buffer Size to use */
 };