summaryrefslogtreecommitdiff
path: root/include/linux/parport.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 12:43:13 (GMT)
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 12:43:13 (GMT)
commitb2faf597d93bdf5e2d12d93ea0815935a73f749e (patch)
tree1876616290ff282b8a0814e2429d23e0104f3701 /include/linux/parport.h
parent638e174688f58200d0deb7435093435e7d737b09 (diff)
parent410c05427a69f53851637ccb85c2212131409fbd (diff)
downloadlinux-fsl-qoriq-b2faf597d93bdf5e2d12d93ea0815935a73f749e.tar.xz
Merge branch 'origin'
Diffstat (limited to 'include/linux/parport.h')
-rw-r--r--include/linux/parport.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h
index f67f838..008d736 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -128,6 +128,11 @@ struct amiga_parport_state {
unsigned char statusdir;/* ciab.ddrb & 7 */
};
+struct ip32_parport_state {
+ unsigned int dcr;
+ unsigned int ecr;
+};
+
struct parport_state {
union {
struct pc_parport_state pc;
@@ -135,6 +140,7 @@ struct parport_state {
struct ax_parport_state ax;
struct amiga_parport_state amiga;
/* Atari has not state. */
+ struct ip32_parport_state ip32;
void *misc;
} u;
};