From 5d50190734783fc95880cb56de192651f7ef7322 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Thu, 22 Apr 2004 23:04:54 +0000 Subject: [PATCH] Dimitar Zhekov: fixed svgalib compilation for linux-2.6.4+ [2004041909283509504] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2805 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jimmy/svgalib/kernel26compat.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package/jimmy/svgalib/kernel26compat.patch b/package/jimmy/svgalib/kernel26compat.patch index cc740d655..5bd67ffbd 100644 --- a/package/jimmy/svgalib/kernel26compat.patch +++ b/package/jimmy/svgalib/kernel26compat.patch @@ -1,5 +1,5 @@ --- ./kernel/svgalib_helper/kernel26compat.h.orig 2003-10-04 16:42:01.000000000 +0300 -+++ ./kernel/svgalib_helper/kernel26compat.h 2004-01-11 17:30:25.000000000 +0200 ++++ ./kernel/svgalib_helper/kernel26compat.h 2004-04-17 15:04:45.000000000 +0300 @@ -9,9 +9,12 @@ # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot) @@ -13,3 +13,15 @@ #else /* Kernel 2.6 */ +@@ -44,10 +47,5 @@ + #endif + + +-/* Our main.c really do not like MINOR from 2.6 kernels ... */ +-#if (defined MINOR) && (!defined KERNEL_2_6) +-# define my_minor(x) MINOR(x) +-#else +-# define my_minor(x) minor(x) +-#endif ++#define my_minor(x) MINOR(x) +