summaryrefslogtreecommitdiff
path: root/hw/kdrive
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-06-05 20:58:04 -0700
committerKeith Packard <keithp@keithp.com>2010-06-05 21:12:35 -0700
commit6b306f43384e5c2143197e746a5a39c4ebb2583c (patch)
treebf2043beb17dcfe3347a577a485b5a81cd2834e7 /hw/kdrive
parentab07e2b8ededaa2193fc199a8c09623d84032280 (diff)
kdrive: Xv code uses shared screen private instead of kdrive-specific private
When doing the devPrivate API conversion, I missed this as there was also a local private key which wasn't ever used. Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/kdrive')
-rw-r--r--hw/kdrive/src/kxv.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 24ae89eac..3af6acfb2 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -105,8 +105,7 @@ static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);
static DevPrivateKeyRec KdXVWindowKeyRec;
#define KdXVWindowKey (&KdXVWindowKeyRec)
-static DevPrivateKeyRec KdXvScreenKeyRec;
-#define KdXvScreenKey (&KdXvScreenKeyRec)
+static DevPrivateKey KdXvScreenKey;
static unsigned long KdXVGeneration = 0;
static unsigned long PortResource = 0;
@@ -202,9 +201,6 @@ KdXVScreenInit(
if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))
return FALSE;
- if (!dixRegisterPrivateKey(&KdXVScreenKeyRec, PRIVATE_SCREEN, 0))
- return FALSE;
-
if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
KdXvScreenKey = (*XvGetScreenKeyProc)();