From c129d0b4dfe65d7d63cab04f4e26b0cc6234bb38 Mon Sep 17 00:00:00 2001
From: "Javier M. Mellid" <jmunhoz@igalia.com>
Date: Tue, 26 Jun 2012 06:00:14 +0200
Subject: [PATCH] --- yaml --- r: 317571 b: refs/heads/master c:
 9b1904c7cf2ff7e69ff2bbf2e0308a231e8064c2 h: refs/heads/master i:   317569:
 ab8a60141909fa275b8e1cecd3bc57303463d587   317567:
 f713a5a625308487b79c71e8b9f2d806cec42a7e v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/sm7xxfb/sm7xx.h   | 1 -
 trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0b8fff7395cd..462d6677af78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 258767fed9da230553d92e2d53f5f872d55795b1
+refs/heads/master: 9b1904c7cf2ff7e69ff2bbf2e0308a231e8064c2
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xx.h b/trunk/drivers/staging/sm7xxfb/sm7xx.h
index 43d86f873410..333f33c3dc66 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xx.h
+++ b/trunk/drivers/staging/sm7xxfb/sm7xx.h
@@ -14,7 +14,6 @@
  */
 
 #define NR_PALETTE        256
-#define NR_RGB            2
 
 #define FB_ACCEL_SMI_LYNX 88
 
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 32111a011f66..4c741e2afd12 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -42,10 +42,6 @@ struct screen_info smtc_screen_info;
 struct smtcfb_info {
 	struct fb_info fb;
 	struct pci_dev *pdev;
-	struct {
-		u8 red, green, blue;
-	} palette[NR_RGB];
-	u_int palette_size;
 
 	u16 chipID;
 	unsigned char __iomem *m_pMMIO;