Rediff for 0.15.0rc4.

1 files changed, 15 insertions, 15 deletions

diff --git a/patches/em8300-adv7170-wss.patch b/patches/em8300-adv7170-wss.patch
index 0d17e2f..4549676 100644
--- a/patches/em8300-adv7170-wss.patch
+++ b/patches/em8300-adv7170-wss.patch
@@ -11,7 +11,7 @@ RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.c,v
 retrieving revision 1.3
 diff -u -r1.3 em8300setup.c
 --- em8300setup/em8300setup.c	8 Mar 2005 01:14:31 -0000	1.3
-+++ em8300setup/em8300setup.c	29 Apr 2005 13:36:15 -0000
++++ em8300setup/em8300setup.c	24 May 2005 14:03:31 -0000
 @@ -112,7 +112,7 @@
  	char ucode_file[200]; // bad hardcoded value ;-)
  
@@ -83,10 +83,10 @@ diff -u -r1.3 em8300setup.c
 Index: include/linux/em8300.h
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/include/linux/em8300.h,v
-retrieving revision 1.37
-diff -u -r1.37 em8300.h
---- include/linux/em8300.h	27 Oct 2004 00:03:14 -0000	1.37
-+++ include/linux/em8300.h	29 Apr 2005 13:36:16 -0000
+retrieving revision 1.38
+diff -u -r1.38 em8300.h
+--- include/linux/em8300.h	17 May 2005 19:25:53 -0000	1.38
++++ include/linux/em8300.h	24 May 2005 14:03:32 -0000
 @@ -80,6 +80,7 @@
  #define EM8300_IOCTL_SCR_SETSPEED _IOW('C',17,unsigned)
  #define EM8300_IOCTL_FLUSH _IOW('C',18,int)
@@ -117,7 +117,7 @@ diff -u -r1.37 em8300.h
  int em8300_ioctl_setvideomode(struct em8300_s *em, int mode);
  int em8300_ioctl_setaspectratio(struct em8300_s *em, int ratio);
 +int em8300_ioctl_setwss(struct em8300_s *em, int wsscode);
- void em8300_ioctl_getstatus(struct em8300_s *em, char *usermsg);
+ int em8300_ioctl_getstatus(struct em8300_s *em, char *usermsg);
  int em8300_ioctl_init(struct em8300_s *em, em8300_microcode_t *useruc);
  void em8300_ioctl_enable_videoout(struct em8300_s *em, int mode);
 Index: modules/adv717x.c
@@ -126,7 +126,7 @@ RCS file: /cvsroot/dxr3/em8300/modules/adv717x.c,v
 retrieving revision 1.45
 diff -u -r1.45 adv717x.c
 --- modules/adv717x.c	9 Apr 2005 20:23:54 -0000	1.45
-+++ modules/adv717x.c	29 Apr 2005 13:36:16 -0000
++++ modules/adv717x.c	24 May 2005 14:03:34 -0000
 @@ -112,6 +112,7 @@
  	int pp_ntsc;
  	int pd_adj_pal;
@@ -253,11 +253,11 @@ diff -u -r1.45 adv717x.c
 Index: modules/em8300_ioctl.c
 ===================================================================
 RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
-retrieving revision 1.46
-diff -u -r1.46 em8300_ioctl.c
---- modules/em8300_ioctl.c	9 Apr 2005 21:50:57 -0000	1.46
-+++ modules/em8300_ioctl.c	29 Apr 2005 13:36:17 -0000
-@@ -178,6 +178,18 @@
+retrieving revision 1.48
+diff -u -r1.48 em8300_ioctl.c
+--- modules/em8300_ioctl.c	23 May 2005 23:44:12 -0000	1.48
++++ modules/em8300_ioctl.c	24 May 2005 14:03:35 -0000
+@@ -188,6 +188,18 @@
  		}
  		break;
  
@@ -276,7 +276,7 @@ diff -u -r1.46 em8300_ioctl.c
  	case _IOC_NR(EM8300_IOCTL_GET_AUDIOMODE):
  		if (!em->ucodeloaded) {
  			return -ENOTTY;
-@@ -515,6 +527,52 @@
+@@ -539,6 +551,52 @@
  	return 0;
  }
  
@@ -335,7 +335,7 @@ RCS file: /cvsroot/dxr3/em8300/modules/encoder.h,v
 retrieving revision 1.8
 diff -u -r1.8 encoder.h
 --- modules/encoder.h	14 Jan 2002 21:41:31 -0000	1.8
-+++ modules/encoder.h	29 Apr 2005 13:36:17 -0000
++++ modules/encoder.h	24 May 2005 14:03:35 -0000
 @@ -13,6 +13,15 @@
  
  #define ENCODER_CMD_SETMODE      1
@@ -358,7 +358,7 @@ RCS file: /cvsroot/dxr3/em8300/em8300setup/em8300setup.1,v
 retrieving revision 1.2
 diff -u -r1.2 em8300setup.1
 --- em8300setup/em8300setup.1	28 Apr 2005 23:18:33 -0000	1.2
-+++ em8300setup/em8300setup.1	29 Apr 2005 13:36:15 -0000
++++ em8300setup/em8300setup.1	24 May 2005 14:03:31 -0000
 @@ -27,6 +27,33 @@
  \fB-o\fR, \fB-w\fR
  Set aspect ratio to respectively normal (4:3) or wide-screen (16:9).