summaryrefslogtreecommitdiff
path: root/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2012-10-04 16:39:54 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2012-10-04 16:39:54 +0200
commit1eeb1687577e4298f969cf781a330af01d2db1ad (patch)
tree6e2858335f96bfb102329b1a1e226754ef5b4049 /package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
parent25e99cefae8cb00b989cfbfb271880c4997e2593 (diff)
fix devfs device node usage (vc/6)
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_c14
1 files changed, 7 insertions, 7 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 ccbe060a4..c6cd39636 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,8 +1,8 @@
Enable the ioBase mapping code for mips, too. This is needed by
xf86-video-siliconmotion.
---- 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-06-05 21:46:29.659792653 +0200
-@@ -485,7 +485,7 @@ unmapVidMem(int ScreenNum, pointer Base,
+--- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-11-23 20:07:26.000000000 +0100
++++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_video.c 2012-10-01 13:23:55.000000000 +0200
+@@ -480,7 +480,7 @@ unmapVidMem(int ScreenNum, pointer Base,
/* I/O Permissions section */
/***************************************************************************/
@@ -11,7 +11,7 @@
volatile unsigned char *ioBase = NULL;
#ifndef __NR_pciconfig_iobase
-@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
+@@ -492,7 +492,7 @@ volatile unsigned char *ioBase = NULL;
Bool
xf86EnableIO(void)
{
@@ -20,7 +20,7 @@
int fd;
unsigned int ioBase_phys;
#endif
-@@ -505,8 +505,12 @@ xf86EnableIO(void)
+@@ -500,8 +500,12 @@ xf86EnableIO(void)
if (ExtendedEnabled)
return TRUE;
@@ -34,7 +34,7 @@
fd = open("/dev/mem", O_RDWR);
if (ioBase == NULL) {
-@@ -522,9 +526,10 @@ xf86EnableIO(void)
+@@ -517,9 +521,10 @@ xf86EnableIO(void)
return FALSE;
}
#endif
@@ -46,7 +46,7 @@
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-@@ -548,10 +553,10 @@ xf86DisableIO(void)
+@@ -545,10 +550,10 @@ xf86DisableIO(void)
{
if (!ExtendedEnabled)
return;