xserver: Branch 'master'

[Adam Jackson]

 hw/kdrive/ephyr/ephyr.c    |    1 -
 hw/kdrive/fake/fake.c      |    6 ------
 hw/kdrive/fbdev/fbdev.c    |    6 ------
 include/dix-config.h.in    |    3 ---
 include/kdrive-config.h.in |    3 ---
 include/xorg-server.h.in   |    3 ---
 6 files changed, 22 deletions(-)

New commits:
commit d08ac3660651c8614a1780750b76c48eeb0870b7
Author: Jamey Sharp <jamey at minilop.net>
Date:   Thu May 12 15:21:52 2011 -0700

    kdrive: Delete unused TOUCHSCREEN define.
    
    There's nothing in configure to enable this, and KdTsPhyScreen isn't
    defined anywhere.
    
    [ajax: Rebase, also clean up Xfbdev]
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jamey Sharp <jamey at minilop.net>

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 1909a06..cb1c16e 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -50,7 +50,6 @@
 
 #include "xkbsrv.h"
 
-extern int KdTsPhyScreen;
 extern Bool ephyr_glamor;
 
 KdKeyboardInfo *ephyrKbd;
diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c
index 04a7278..7205df4 100644
--- a/hw/kdrive/fake/fake.c
+++ b/hw/kdrive/fake/fake.c
@@ -25,8 +25,6 @@
 #endif
 #include "fake.h"
 
-extern int KdTsPhyScreen;
-
 Bool
 fakeInitialize(KdCardInfo * card, FakePriv * priv)
 {
@@ -364,10 +362,6 @@ fakeCreateColormap(ColormapPtr pmap)
 Bool
 fakeInitScreen(ScreenPtr pScreen)
 {
-#ifdef TOUCHSCREEN
-    KdTsPhyScreen = pScreen->myNum;
-#endif
-
     pScreen->CreateColormap = fakeCreateColormap;
     return TRUE;
 }
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index 23f7509..9b69edf 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -28,8 +28,6 @@
 
 #include <errno.h>
 
-extern int KdTsPhyScreen;
-
 const char *fbdevDevicePath = NULL;
 
 static Bool
@@ -698,10 +696,6 @@ fbdevCreateColormap(ColormapPtr pmap)
 Bool
 fbdevInitScreen(ScreenPtr pScreen)
 {
-#ifdef TOUCHSCREEN
-    KdTsPhyScreen = pScreen->myNum;
-#endif
-
     pScreen->CreateColormap = fbdevCreateColormap;
     return TRUE;
 }
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index daaff8d..112ab95 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -307,9 +307,6 @@
 /* Support TCP socket connections */
 #undef TCPCONN
 
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB
 
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index 0e54aa1..3d7e9a4 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -13,9 +13,6 @@
 /* Include framebuffer support in X servers */
 #undef KDRIVEFBDEV
 
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB
 
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 3152dbd..e46ccec 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -101,9 +101,6 @@
 /* Support TCP socket connections */
 #undef TCPCONN
 
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB