diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 1909a06e9a..cb1c16e4e5 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 04a7278979..7205df4019 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 23f7509248..9b69edf953 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -28,8 +28,6 @@ #include -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 daaff8d5ad..112ab952fc 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 0e54aa18fb..3d7e9a4a7b 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 3152dbd68d..e46ccecf71 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