summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2012-10-15 23:11:30 (GMT)
committerAdam Jackson <ajax@redhat.com>2012-10-15 23:11:30 (GMT)
commit7d4402786b758de3e6ce2641e15a39d612d5c518 (patch)
treebc7510c743b6db4cb2abcf4d737cf09688d8b12d
parent926d4f655c8491b68a338f50c810f6729686ec9f (diff)
Stop including xf86Priv.h
As the name might suggest, it's server-private. Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/sis.h1
-rw-r--r--src/sis_driver.c4
2 files changed, 4 insertions, 1 deletions
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.
*/