SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - fix conflict with fbs...

[baggins]

Author: baggins                      Date: Fri Dec  2 17:37:58 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fix conflict with fbsplash

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.2 SOURCES/linux-2.6-vs2.1.patch:1.1.2.3
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.2	Tue Nov 22 16:53:10 2005
+++ SOURCES/linux-2.6-vs2.1.patch	Fri Dec  2 18:37:51 2005
@@ -12693,10 +12693,10 @@
 --- linux-2.6.14.2/include/linux/sysctl.h	2005-11-12 23:57:44 +0100
 +++ linux-2.6.14.2-vs2.1.0-rc8/include/linux/sysctl.h	2005-11-13 00:14:49 +0100
 @@ -147,6 +147,7 @@ enum
- 	KERN_RANDOMIZE=68, /* int: randomize virtual address space */
  	KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
  	KERN_SPIN_RETRY=70,	/* int: number of spinlock retries */
-+	KERN_VSHELPER=71,	/* string: path to vshelper policy agent */
+ 	KERN_FBSPLASH=71,	/* string: path to fbsplash helper */
++	KERN_VSHELPER=72,	/* string: path to vshelper policy agent */
  };
  
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.2&r2=1.1.2.3&f=u