diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:40:46 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:40:46 +0100 |
commit | cf53aff5d6feebf06953794b03b1793cda3e2f77 (patch) | |
tree | 7007ec3309cf29392ab978fb6f2519a86678c966 /package/xorg-server/patches/patch-hw_xfree86_common_compiler_h | |
parent | 093c542e059b733e0207ce072679c2267339b860 (diff) | |
parent | bc561e500e22bc9d953fd9a80144f80295a4cbbd (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
update Xorg / Mesa
Conflicts:
TODO
Diffstat (limited to 'package/xorg-server/patches/patch-hw_xfree86_common_compiler_h')
-rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_common_compiler_h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h deleted file mode 100644 index 8a5f29ebd..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ /dev/null @@ -1,58 +0,0 @@ ---- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/xfree86/common/compiler.h 2013-04-30 10:52:21.000000000 +0200 -@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b - #define PORT_SIZE short - #endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) - { -- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outw(unsigned PORT_SIZE port, unsigned short val) - { -- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outl(unsigned PORT_SIZE port, unsigned int val) - { -- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - -@@ -737,21 +737,21 @@ static __inline__ unsigned int - inb(unsigned PORT_SIZE port) - { - return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inw(unsigned PORT_SIZE port) - { - return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inl(unsigned PORT_SIZE port) - { - return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - #if defined(__mips__) |