Sophie

Sophie

distrib > Altlinux > 4.1 > i586 > by-pkgid > c95c1ec95fa99175d7fc954bba040ef2 > files > 3

kernel-modules-svgalib_helper-ovz-smp-1.9.25-alt4.132626.24.src.rpm

--- kernel-source-svgalib_helper-1.9.25/Makefile.orig	2006-09-27 23:09:47 +0400
+++ kernel-source-svgalib_helper-1.9.25/Makefile	2006-09-28 01:09:16 +0400
@@ -25,7 +25,9 @@ else
 endif
 
 
+ifeq ($(PATCHLEVEL),6)
 CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h)
+endif
 
 ifneq ($(CLASS_SIMPLE),)
   CLASS_CFLAGS = -DCLASS_SIMPLE=1
@@ -35,7 +37,7 @@ EXTRA_CFLAGS := -DSVGALIB_HELPER_MAJOR=$
 
 
 default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) CLASS_CFLAGS=$(CLASS_CFLAGS) modules
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) CLASS_CFLAGS=$(CLASS_CFLAGS) EXTRA_CFLAGS=$(EXTRA_CFLAGS) modules
 
 depend:
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) depend
--- kernel-source-svgalib_helper-1.9.25/main.c.orig	2006-09-28 00:23:50 +0400
+++ kernel-source-svgalib_helper-1.9.25/main.c	2006-09-28 01:01:29 +0400
@@ -19,14 +19,11 @@
 #include <linux/pci.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/mm.h>
-#include <linux/thread_info.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 
 #include <linux/sched.h>
 #include <linux/wait.h>
-#include <linux/syscalls.h>
-
 #define __KERNEL_SYSCALLS__
 #include <linux/unistd.h>
 asmlinkage long (*s_ioperm)(unsigned long from, unsigned long num, int turn_on);
@@ -40,6 +37,10 @@ asmlinkage long (*s_ioperm)(unsigned lon
 #include <asm/irq.h>
 
 #include "kernel26compat.h"
+#if defined(KERNEL_2_6)
+#include <linux/syscalls.h>
+#include <linux/thread_info.h>
+#endif
 
 #include "svgalib_helper.h"