summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-03-12 22:32:38 +0000
committerMike Frysinger <vapier@gentoo.org>2004-03-12 22:32:38 +0000
commit9ba42e90316aa3733c5d5df8ae4a76a98eca1fbb (patch)
tree744554cdd8a3bb7898e14104d277186749fe96a8 /dev-libs/DirectFB/files
parenthppa stable (diff)
downloadhistorical-9ba42e90316aa3733c5d5df8ae4a76a98eca1fbb.tar.gz
historical-9ba42e90316aa3733c5d5df8ae4a76a98eca1fbb.tar.bz2
historical-9ba42e90316aa3733c5d5df8ae4a76a98eca1fbb.zip
include i2c-dev.h when using 2.4.x and i2c.h when using 2.6.x #43938
Diffstat (limited to 'dev-libs/DirectFB/files')
-rw-r--r--dev-libs/DirectFB/files/0.9.20-linux-2.6.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/dev-libs/DirectFB/files/0.9.20-linux-2.6.patch b/dev-libs/DirectFB/files/0.9.20-linux-2.6.patch
index 3547bfe7ee2b..c134be794719 100644
--- a/dev-libs/DirectFB/files/0.9.20-linux-2.6.patch
+++ b/dev-libs/DirectFB/files/0.9.20-linux-2.6.patch
@@ -1,5 +1,5 @@
---- interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c.orig 2003-12-23 19:23:58.346966040 -0500
-+++ interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c 2003-12-23 19:24:26.624667176 -0500
+--- interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c.orig 2003-12-23 19:23:58.346966040 -0500
++++ interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c 2003-12-23 19:24:26.624667176 -0500
@@ -27,6 +27,7 @@
#if defined(__dietlibc__) && !defined(_BSD_SOURCE)
#define _BSD_SOURCE
@@ -8,14 +8,18 @@
#include <stdio.h>
#include <stdlib.h>
---- gfxdrivers/matrox/matrox_maven.c.orig 2004-03-04 06:59:43.268677032 -0500
-+++ gfxdrivers/matrox/matrox_maven.c 2004-03-04 06:59:48.089944088 -0500
-@@ -29,7 +29,7 @@
+--- gfxdrivers/matrox/matrox_maven.c.orig 2004-03-12 17:26:41.664570688 -0500
++++ gfxdrivers/matrox/matrox_maven.c 2004-03-12 17:27:42.782279384 -0500
+@@ -29,7 +29,12 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
--#include <linux/i2c-dev.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ #include <linux/i2c-dev.h>
++#else
+#include <linux/i2c.h>
++#endif
#include <misc/memcpy.h>
#include <misc/util.h>