Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / include / linux / parport.h

diff --git a/include/linux/parport.h b/include/linux/parport.h
index d42737e..5bf321e 100644 (file)
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -127,6 +127,10 @@ struct amiga_parport_state {
        unsigned char statusdir;/* ciab.ddrb & 7 */
 };
 
+struct ax88796_parport_state {
+       unsigned char cpr;
+};
+
 struct ip32_parport_state {
        unsigned int dcr;
        unsigned int ecr;
@@ -138,6 +142,7 @@ struct parport_state {
                /* ARC has no state. */
                struct ax_parport_state ax;
                struct amiga_parport_state amiga;
+               struct ax88796_parport_state ax88796;
                /* Atari has not state. */
                struct ip32_parport_state ip32;
                void *misc;