[patch] Patch to fix compilation for 2.6.15

svgalib-1.9.21-kernel2.6.15.patch (text/plain), 3.02 KB, created by Aquila on 2006-01-03 01:33:46 UTC

diff -urN svgalib-1.9.21-r1/work/svgalib-1.9.21/kernel/svgalib_helper/interrupt.c svgalib-1.9.21-patched-r1/work/svgalib-1.9.21/kernel/svgalib_helper/interrupt.c
--- svgalib-1.9.21-r1/work/svgalib-1.9.21/kernel/svgalib_helper/interrupt.c	2005-03-13 16:05:58.000000000 +0100
+++ svgalib-1.9.21-patched-r1/work/svgalib-1.9.21/kernel/svgalib_helper/interrupt.c	2006-01-03 09:18:20.000000000 +0100
@@ -283,13 +283,13 @@
                     dev->disable_vsync = rage_ack_vsync;
             }
             break;
-        case PCI_VENDOR_ID_RENDITION:
-            dev->iobase = dev->mem[1];
-            dev->test_vsync = rendition_test_vsync;
-            dev->ack_vsync = rendition_ack_vsync;
-            dev->enable_vsync = rendition_enable_vsync;
-            dev->disable_vsync = rendition_ack_vsync;
-            break;
+//        case PCI_VENDOR_ID_RENDITION:
+//            dev->iobase = dev->mem[1];
+//            dev->test_vsync = rendition_test_vsync;
+//            dev->ack_vsync = rendition_ack_vsync;
+//            dev->enable_vsync = rendition_enable_vsync;
+//            dev->disable_vsync = rendition_ack_vsync;
+//            break;
 		case PCI_VENDOR_ID_S3:
 			dev->membase = ioremap(dev->mem[0]+0x1000000, 0x10000);
             dev->test_vsync = s3_test_vsync;
diff -urN svgalib-1.9.21-r1/work/svgalib-1.9.21/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.21-patched-r1/work/svgalib-1.9.21/kernel/svgalib_helper/kernel26compat.h
--- svgalib-1.9.21-r1/work/svgalib-1.9.21/kernel/svgalib_helper/kernel26compat.h	2006-01-03 09:22:30.000000000 +0100
+++ svgalib-1.9.21-patched-r1/work/svgalib-1.9.21/kernel/svgalib_helper/kernel26compat.h	2006-01-03 09:23:01.000000000 +0100
@@ -84,6 +84,21 @@
 #  define SLH_SYSFS_REGISTER                                            \
      svgalib_helper_class = class_create(THIS_MODULE, "svgalib_helper");
 
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+
+#  define SLH_SYSFS_ADD_CONTROL                                         \
+     class_device_create(svgalib_helper_class, NULL,                  	\
+                             MKDEV(SVGALIB_HELPER_MAJOR, 0),            \
+                             NULL, "svga");
+
+#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)                           \
+     class_device_create(svgalib_helper_class, NULL,                  	\
+                             MKDEV(SVGALIB_HELPER_MAJOR, _minor),       \
+                             &sh_pci_devs[_minor]->dev->dev, _name);
+#else
+
+
 #  define SLH_SYSFS_ADD_CONTROL                                         \
      class_device_create(svgalib_helper_class,                      	\
                              MKDEV(SVGALIB_HELPER_MAJOR, 0),            \
@@ -93,6 +108,8 @@
      class_device_create(svgalib_helper_class,                      	\
                              MKDEV(SVGALIB_HELPER_MAJOR, _minor),       \
                              &sh_pci_devs[_minor]->dev->dev, _name);
+#endif
+
 
 #  define SLH_SYSFS_REMOVE_DEVICE(i)                                    \
      class_destroy(svgalib_helper_class);