SOURCES: svgalib-2.6.23.patch - converted to unidiff

[hawk]

Author: hawk                         Date: Wed Jan 23 16:36:39 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- converted to unidiff

---- Files affected:
SOURCES:
   svgalib-2.6.23.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/svgalib-2.6.23.patch
diff -u SOURCES/svgalib-2.6.23.patch:1.1 SOURCES/svgalib-2.6.23.patch:1.2
--- SOURCES/svgalib-2.6.23.patch:1.1	Wed Jan 23 17:26:29 2008
+++ SOURCES/svgalib-2.6.23.patch	Wed Jan 23 17:36:33 2008
@@ -1,34 +1,24 @@
-*** ./svgalib-1.9.25/kernel/svgalib_helper/kernel26compat.h.orig	Fri Oct 12 22:14:40 2007
---- ./svgalib-1.9.25/kernel/svgalib_helper/kernel26compat.h	Fri Oct 12 22:43:17 2007
-***************
-*** 70,75 ****
---- 70,76 ----
-  
-  /* These are also not present in 2.6 kernels ... */
-  #if (!defined _LINUX_DEVFS_FS_KERNEL_H) || (defined KERNEL_2_6)
-+ #include <linux/fs.h>
-  static inline int devfs_register_chrdev (unsigned int major, const char *name,
-                                           struct file_operations *fops)
-  {
-***************
-*** 77,83 ****
-  }
-  static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
-  {
-!     return unregister_chrdev (major, name);
-  }
-  #endif
-  
---- 78,89 ----
-  }
-  static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
-  {
-! #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)    
-!    return unregister_chrdev (major, name);
-! #else
-!     unregister_chrdev (major, name);
-!     return 0;
-! #endif
-  }
-  #endif
-  
+--- svgalib-1.9.25/kernel/svgalib_helper/kernel26compat.h.orig	2008-01-23 17:27:18.941786030 +0100
++++ svgalib-1.9.25/kernel/svgalib_helper/kernel26compat.h	2008-01-23 17:28:35.145599705 +0100
+@@ -83,6 +83,7 @@
+ 
+ /* These are also not present in 2.6 kernels ... */
+ #if (!defined _LINUX_DEVFS_FS_KERNEL_H) || (defined KERNEL_2_6)
++#include <linux/fs.h>
+ static inline int devfs_register_chrdev (unsigned int major, const char *name,
+                                          struct file_operations *fops)
+ {
+@@ -90,7 +91,12 @@
+ }
+ static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
+ {
+-    return unregister_chrdev (major, name);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)    
++   return unregister_chrdev (major, name);
++#else
++    unregister_chrdev (major, name);
++    return 0;
++#endif
+ }
+ #endif
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/svgalib-2.6.23.patch?r1=1.1&r2=1.2&f=u