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]);