From 2f25138e82065bbda097dce1b7913e5eb5d55d14 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 26 Jul 2008 13:25:25 -0300
Subject: [PATCH] --- yaml --- r: 106751 b: refs/heads/master c:
 fdd2a7e2dac56a3384068802be46b822f2aed703 h: refs/heads/master i:   106749:
 02a87f11c4e9dfa5c9cb0e2ab48e1c195a3a8cd0   106747:
 ecd71bbb0770da019ee4adf402075f989b7011b0   106743:
 d811845f1a217c72d347a4081c2b0f8b681336cb   106735:
 2180f277dbe17cbd682720ba197d3cc6b3d62f8f   106719:
 ec60e3dedf5b77ae783cf5233f049ceea253c66a   106687:
 c3af47fccc58c95f7861ef29479032ca5260cee4   106623:
 6c98fc90cec3d653669358eac5e5b7de98db13b7   106495:
 875b556c2a6c4cb2319b38607585bd7a1a584c3a v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/videotext.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1857b57b632d..30030bafa055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed1aedb136ca42dfd70f5bef202d23994c1a3bae
+refs/heads/master: fdd2a7e2dac56a3384068802be46b822f2aed703
diff --git a/trunk/include/linux/videotext.h b/trunk/include/linux/videotext.h
index 018f92047ff8..3e68c8d1c7f7 100644
--- a/trunk/include/linux/videotext.h
+++ b/trunk/include/linux/videotext.h
@@ -45,10 +45,10 @@
 #define VTXIOCCLRCACHE_OLD 0x710b  /* clear cache on VTX-interface (if avail.) */
 #define VTXIOCSETVIRT_OLD  0x710c  /* turn on virtual mode (this disables TV-display) */
 
-/* 
+/*
  *	Definitions for VTXIOCGETINFO
  */
- 
+
 #define SAA5243 0
 #define SAA5246 1
 #define SAA5249 2
@@ -57,10 +57,10 @@
 
 typedef struct {
 	int version_major, version_minor;	/* version of driver; if version_major changes, driver */
-						/* is not backward compatible!!! CHECK THIS!!! */  
+						/* is not backward compatible!!! CHECK THIS!!! */
 	int numpages;				/* number of page-buffers of vtx-chipset */
 	int cct_type;				/* type of vtx-chipset (SAA5243, SAA5246, SAA5248 or
-  						 * SAA5249) */
+						 * SAA5249) */
 }
 vtx_info_t;
 
@@ -81,7 +81,7 @@ vtx_info_t;
 #define PGMASK_HOUR (HR_TEN | HR_UNIT)
 #define PGMASK_MINUTE (MIN_TEN | MIN_UNIT)
 
-typedef struct 
+typedef struct
 {
 	int page;	/* number of requested page (hexadecimal) */
 	int hour;	/* requested hour (hexadecimal) */
@@ -98,11 +98,11 @@ vtx_pagereq_t;
 /*
  *	Definitions for VTXIOC{GETSTAT,PUTSTAT}
  */
- 
+
 #define VTX_PAGESIZE (40 * 24)
 #define VTX_VIRTUALSIZE (40 * 49)
 
-typedef struct 
+typedef struct
 {
 	int pagenum;			/* number of page (hexadecimal) */
 	int hour;			/* hour (hexadecimal) */
@@ -121,5 +121,5 @@ typedef struct
 	unsigned hamming : 1;		/* hamming-error occurred */
 }
 vtx_pageinfo_t;
- 
+
 #endif /* _VTX_H */