diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/xf86-video-intel/patches/patch-uxa_uxa-priv_h | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/xf86-video-intel/patches/patch-uxa_uxa-priv_h')
| -rw-r--r-- | package/xf86-video-intel/patches/patch-uxa_uxa-priv_h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package/xf86-video-intel/patches/patch-uxa_uxa-priv_h b/package/xf86-video-intel/patches/patch-uxa_uxa-priv_h new file mode 100644 index 000000000..205367b55 --- /dev/null +++ b/package/xf86-video-intel/patches/patch-uxa_uxa-priv_h @@ -0,0 +1,11 @@ +--- xf86-video-intel-2.9.1.orig/uxa/uxa-priv.h 2009-10-26 12:48:05.000000000 +0100 ++++ xf86-video-intel-2.9.1/uxa/uxa-priv.h 2010-04-16 20:13:57.000000000 +0200 +@@ -46,7 +46,7 @@ + #include <X11/extensions/shm.h> + #else + #define _XSHM_SERVER_ +-#include <X11/extensions/shmstr.h> ++#include <xorg/shmint.h> + #endif + #endif + #include "scrnintstr.h" |