66b6baf416
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
44 lines
1.0 KiB
Diff
44 lines
1.0 KiB
Diff
From 7d4402786b758de3e6ce2641e15a39d612d5c518 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Mon, 15 Oct 2012 23:11:30 +0000
|
|
Subject: Stop including xf86Priv.h
|
|
|
|
As the name might suggest, it's server-private.
|
|
|
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
---
|
|
Fetch from:
|
|
http://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=7d4402786b758de3e6ce2641e15a39d612d5c518
|
|
|
|
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
|
|
|
|
diff --git a/src/sis.h b/src/sis.h
|
|
index 46fca2a..20e6134 100644
|
|
--- a/src/sis.h
|
|
+++ b/src/sis.h
|
|
@@ -75,7 +75,6 @@
|
|
|
|
#include "compiler.h"
|
|
#include "xf86Pci.h"
|
|
-#include "xf86Priv.h"
|
|
#include "xf86_OSproc.h"
|
|
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
|
#include "xf86Resources.h"
|
|
diff --git a/src/sis_driver.c b/src/sis_driver.c
|
|
index 46cfefd..cefe503 100644
|
|
--- a/src/sis_driver.c
|
|
+++ b/src/sis_driver.c
|
|
@@ -93,6 +93,10 @@
|
|
#include "dri.h"
|
|
#endif
|
|
|
|
+#ifndef DEFAULT_DPI
|
|
+#define DEFAULT_DPI 96
|
|
+#endif
|
|
+
|
|
/*
|
|
* LookupWindow was removed with video abi 11.
|
|
*/
|
|
--
|
|
cgit v0.9.0.2-2-gbebe
|