From 759798a9a4821a0781de0c139997ee76ecff8338 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 27 Apr 2010 16:06:14 -0700
Subject: [PATCH] --- yaml --- r: 196990 b: refs/heads/master c:
 ffefea471134987fc647f0a7502540bb6e5ae71f h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/dt3155/dt3155.h | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 30eb49258cfa..74beca2d856b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e43a0edcb066935268b60c3444e30423bfee664c
+refs/heads/master: ffefea471134987fc647f0a7502540bb6e5ae71f
diff --git a/trunk/drivers/staging/dt3155/dt3155.h b/trunk/drivers/staging/dt3155/dt3155.h
index 37d9fc6d0636..453686e8064c 100644
--- a/trunk/drivers/staging/dt3155/dt3155.h
+++ b/trunk/drivers/staging/dt3155/dt3155.h
@@ -38,9 +38,6 @@ MA 02111-1307 USA
 #include <linux/time.h>		/* struct timeval */
 
 
-#define TRUE  1
-#define FALSE 0
-
 /* Uncomment this for 50Hz CCIR */
 #define CCIR 1
 
@@ -55,11 +52,11 @@ MA 02111-1307 USA
 #ifdef CCIR
 #define DT3155_MAX_ROWS	576
 #define DT3155_MAX_COLS	768
-#define FORMAT50HZ	TRUE
+#define FORMAT50HZ	1
 #else
 #define DT3155_MAX_ROWS	480
 #define DT3155_MAX_COLS	640
-#define FORMAT50HZ	FALSE
+#define FORMAT50HZ	0
 #endif
 
 /* Configuration structure */