From 2410f6f8fc9c62ff6895fbcc23bec2afc7ffc016 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 14 Jan 2012 12:21:18 +0000
Subject: [PATCH] --- yaml --- r: 296349 b: refs/heads/master c:
 d1a378876c2ab3ea119eea502e8d48e25ef253e4 h: refs/heads/master i:   296347:
 82f4ce87424762eaf111085fb0d8fc91320b258d v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/sa1100fb.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f475d3ee7caf..d9831eecea6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 086ada54abaa4316e8603f02410fe8ebc9ba2de1
+refs/heads/master: d1a378876c2ab3ea119eea502e8d48e25ef253e4
diff --git a/trunk/drivers/video/sa1100fb.c b/trunk/drivers/video/sa1100fb.c
index c9f1e7cd95f8..f6e27f4da1d8 100644
--- a/trunk/drivers/video/sa1100fb.c
+++ b/trunk/drivers/video/sa1100fb.c
@@ -182,7 +182,6 @@
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <mach/assabet.h>
 #include <mach/shannon.h>
 
 /*
@@ -190,8 +189,6 @@
  */
 #define DEBUG_VAR 1
 
-#undef ASSABET_PAL_VIDEO
-
 #include "sa1100fb.h"
 
 static const struct sa1100fb_rgb rgb_4 = {
@@ -1229,11 +1226,6 @@ static int __devinit sa1100fb_probe(struct platform_device *pdev)
 		goto failed;
 	}
 
-#ifdef ASSABET_PAL_VIDEO
-	if (machine_is_assabet())
-		ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);
-#endif
-
 	/*
 	 * This makes sure that our colour bitfield
 	 * descriptors are correctly initialised.