[parisc-linux-cvs] linux-2.4 deller

[Helge Deller]

--Boundary-00=_3Q4q/QSSFDjGfqh
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Friday 07 November 2003 12:36, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux-2.4
> Changes by:	deller	03/11/07 04:36:49
>
> Modified files:
> 	.              : Makefile
> 	arch/parisc/kernel: ioctl32.c
>
> Log message:
> kernel 2.4.22--pa14:
> apply COMPATIBLE_IOCTL(PPPIOCGCHAN) patch by Nicolas JULIEN <gronico AT
> gronico.org>


--Boundary-00=_3Q4q/QSSFDjGfqh
Content-Type: text/x-diff;
  charset="iso-8859-15";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="diff"

Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.4/Makefile,v
retrieving revision 1.427
diff -u -p -r1.427 Makefile
--- Makefile	21 Oct 2003 15:42:00 -0000	1.427
+++ Makefile	7 Nov 2003 11:35:32 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -pa13
+EXTRAVERSION = -pa14
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: arch/parisc/kernel/ioctl32.c
===================================================================
RCS file: /var/cvs/linux-2.4/arch/parisc/kernel/ioctl32.c,v
retrieving revision 1.17
diff -u -p -r1.17 ioctl32.c
--- arch/parisc/kernel/ioctl32.c	22 Sep 2003 17:56:43 -0000	1.17
+++ arch/parisc/kernel/ioctl32.c	7 Nov 2003 11:35:36 -0000
@@ -3176,9 +3176,10 @@ COMPATIBLE_IOCTL(PPPIOCSMRRU)
 COMPATIBLE_IOCTL(PPPIOCCONNECT)
 COMPATIBLE_IOCTL(PPPIOCDISCONN)
 COMPATIBLE_IOCTL(PPPIOCATTCHAN)
+COMPATIBLE_IOCTL(PPPIOCGCHAN)
 /* PPPOX */
-COMPATIBLE_IOCTL(PPPOEIOCSFWD);
-COMPATIBLE_IOCTL(PPPOEIOCDFWD);
+COMPATIBLE_IOCTL(PPPOEIOCSFWD)
+COMPATIBLE_IOCTL(PPPOEIOCDFWD)
 /* CDROM stuff */
 COMPATIBLE_IOCTL(CDROMPAUSE)
 COMPATIBLE_IOCTL(CDROMRESUME)

--Boundary-00=_3Q4q/QSSFDjGfqh--