diff --git a/[refs] b/[refs]
index 26f70ce2f2c3..29c2e19ed9ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86f3125b84b1b830c19ec733bcbea927590e635d
+refs/heads/master: d89954fa9b3db254d40136080e91f8ce19646345
diff --git a/trunk/drivers/staging/sm7xx/smtcfb.c b/trunk/drivers/staging/sm7xx/smtcfb.c
index 39ba55868fac..abed491ef465 100644
--- a/trunk/drivers/staging/sm7xx/smtcfb.c
+++ b/trunk/drivers/staging/sm7xx/smtcfb.c
@@ -105,14 +105,6 @@ char __iomem *smtc_VRAMBaseAddress;	/* video memory starting address */
 static u32 colreg[17];
 static struct par_info hw;	/* hardware information */
 
-u16 smtc_ChipIDs[] = {
-	0x710,
-	0x712,
-	0x720
-};
-
-#define numSMTCchipIDs ARRAY_SIZE(smtc_ChipIDs)
-
 static struct fb_var_screeninfo smtcfb_var = {
 	.xres           = 1024,
 	.yres           = 600,
diff --git a/trunk/drivers/staging/sm7xx/smtcfb.h b/trunk/drivers/staging/sm7xx/smtcfb.h
index ab95af2b9c07..70283a1e4d36 100644
--- a/trunk/drivers/staging/sm7xx/smtcfb.h
+++ b/trunk/drivers/staging/sm7xx/smtcfb.h
@@ -20,12 +20,6 @@
 
 #define FB_ACCEL_SMI_LYNX 88
 
-#ifdef __BIG_ENDIAN
-#define PC_VGA            0
-#else
-#define PC_VGA            1
-#endif
-
 #define SCREEN_X_RES      1024
 #define SCREEN_Y_RES      600
 #define SCREEN_BPP        16