summaryrefslogtreecommitdiff
blob: 5e2d1e527cbbc05d9213ea2073b7e98631621aea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
diff -Naur svgalib-1.9.25/kernel/svgalib_helper/main.c svgalib-1.9.25_new/kernel/svgalib_helper/main.c
--- svgalib-1.9.25/kernel/svgalib_helper/main.c    2006-01-12 18:17:53.000000000 +0000
+++ svgalib-1.9.25_new/kernel/svgalib_helper/main.c    2012-06-25 15:02:11.000000000 +0100
@@ -33,7 +33,9 @@
 
 #include <asm/processor.h>
 #include <asm/uaccess.h>
-#include <asm/system.h>   /* cli(), *_flags */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
+  #include <asm/system.h>   /* cli(), *_flags */
+#endif
 #include <asm/segment.h>  /* memcpy and such */
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff -Naur svgalib-1.9.25/kernel/svgalib_helper/Makefile svgalib-1.9.25_new/kernel/svgalib_helper/Makefile
--- svgalib-1.9.25/kernel/svgalib_helper/Makefile    2006-05-20 13:31:04.000000000 +0100
+++ svgalib-1.9.25_new/kernel/svgalib_helper/Makefile    2012-06-25 13:39:38.000000000 +0100
@@ -11,9 +11,11 @@
    PWD    := $(shell pwd)
    TARGET  := svgalib_helper
 
+   ifneq ($(TOPDIR),)
       ifeq ($(PATCHLEVEL),4)
          include $(TOPDIR)/Rules.make
       endif
+   endif 
 
 else