diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
| commit | d22b78be7b2b95ba028c6584e9ee5abb69a375cb (patch) | |
| tree | 039da0ef61265cda4512279d36aea46c4670a715 /package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c | |
| parent | 702e216210d58f1301c80d4e55af5d29f813eb19 (diff) | |
| parent | 2e2eee9052d2c487d7114818ca446c370dba7f49 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c')
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index 8c93131b1..d0c187169 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -1,6 +1,15 @@ ---- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-02-16 01:24:23.000000000 +0100 -+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-08 21:31:20.000000000 +0100 -@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL; +--- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-03-12 05:38:22.000000000 +0100 ++++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c 2010-05-14 19:06:06.873473002 +0200 +@@ -64,6 +64,8 @@ static Bool ExtendedEnabled = FALSE; + !defined(__mips__) && \ + !defined(__arm__) + ++#include "compiler.h" ++ + /* + * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare + * these. +@@ -497,7 +499,7 @@ volatile unsigned char *ioBase = NULL; Bool xf86EnableIO(void) { @@ -9,7 +18,7 @@ int fd; unsigned int ioBase_phys; #endif -@@ -524,6 +524,20 @@ xf86EnableIO(void) +@@ -524,6 +526,20 @@ xf86EnableIO(void) #endif } close(fd); |