From 42303fc8d9abd0a082d937c36d0e2bf3b5c3a873 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Mon, 12 Dec 2005 00:37:35 -0800
Subject: [PATCH] --- yaml --- r: 15039 b: refs/heads/master c:
 68799398cea44b81d1e919f842d8d84d471053d5 h: refs/heads/master i:   15037:
 43afafe7b14ac810147631b2153af0a0fd29ca4a   15035:
 b16dca94991c9ed5c2fc4edfc625887177221f89   15031:
 588f601d0f96b0a01518aafe7905147c7f024efc   15023:
 9bee89532d874665d19df5b195390bd4cb247086   15007:
 d033b9f72ae84f8e4eea863774e8aaaebbe6429c   14975:
 fb6151ed359c11646e35660ed0dfda2292e79b8f v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/parport_pc.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 47ff7bf47389..34c88aaecd4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf8d5c52c3b6b27061e3b7d779057fd9a6cac164
+refs/heads/master: 68799398cea44b81d1e919f842d8d84d471053d5
diff --git a/trunk/include/linux/parport_pc.h b/trunk/include/linux/parport_pc.h
index 7825c76cbd00..c6f762470879 100644
--- a/trunk/include/linux/parport_pc.h
+++ b/trunk/include/linux/parport_pc.h
@@ -86,7 +86,7 @@ extern __inline__ void dump_parport_state (char *str, struct parport *p)
 	unsigned char dcr = inb (CONTROL (p));
 	unsigned char dsr = inb (STATUS (p));
 	static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
-	const struct parport_pc_private *priv = (parport_pc_private *)p->physport->private_data;
+	const struct parport_pc_private *priv = p->physport->private_data;
 	int i;
 
 	printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]);