From dcbb74e0eee894faf31b2fb4b43136057a91ecc7 Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Thu, 15 Sep 2011 16:44:48 -0500
Subject: [PATCH] --- yaml --- r: 271316 b: refs/heads/master c:
 4a64e49df282d55754f9bbb5f14ca4d783128df4 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/video/fsl-diu-fb.c | 12 ------------
 trunk/include/linux/fsl-diu-fb.h |  5 -----
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 448e6b6947a3..97a69896c778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 154152aeea2c5ee4fd01b842257f5cb562234834
+refs/heads/master: 4a64e49df282d55754f9bbb5f14ca4d783128df4
diff --git a/trunk/drivers/video/fsl-diu-fb.c b/trunk/drivers/video/fsl-diu-fb.c
index 10ee411df3cf..226f4bc345d5 100644
--- a/trunk/drivers/video/fsl-diu-fb.c
+++ b/trunk/drivers/video/fsl-diu-fb.c
@@ -902,9 +902,6 @@ static int fsl_diu_setcolreg(unsigned int regno, unsigned int red,
 			ret = 0;
 		}
 		break;
-	case FB_VISUAL_STATIC_PSEUDOCOLOR:
-	case FB_VISUAL_PSEUDOCOLOR:
-		break;
 	}
 
 	return ret;
@@ -1056,15 +1053,6 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
 		if (copy_to_user(buf, ad, sizeof(*ad)))
 			return -EFAULT;
 		break;
-	case FBIOGET_HWCINFO:
-		pr_debug("FBIOGET_HWCINFO:0x%08x\n", FBIOGET_HWCINFO);
-		break;
-	case FBIOPUT_MODEINFO:
-		pr_debug("FBIOPUT_MODEINFO:0x%08x\n", FBIOPUT_MODEINFO);
-		break;
-	case FBIOGET_DISPINFO:
-		pr_debug("FBIOGET_DISPINFO:0x%08x\n", FBIOGET_DISPINFO);
-		break;
 
 	default:
 		dev_err(info->dev, "unknown ioctl command (0x%08X)\n", cmd);
diff --git a/trunk/include/linux/fsl-diu-fb.h b/trunk/include/linux/fsl-diu-fb.h
index daa9952d2174..5ebffa69a0f6 100644
--- a/trunk/include/linux/fsl-diu-fb.h
+++ b/trunk/include/linux/fsl-diu-fb.h
@@ -27,11 +27,6 @@
 
 #include <linux/types.h>
 
-struct mfb_alpha {
-	int enable;
-	int alpha;
-};
-
 struct mfb_chroma_key {
 	int enable;
 	__u8  red_max;