Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

[karo-tx-linux.git] / include / linux / istallion.h

diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 0d1840723249c046d09ba89d0f9f56b67e035774..ad700a60c1587c19b7abfd90c3c120fa75950d2c 100644 (file)
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -59,9 +59,7 @@ struct stliport {
        unsigned int            devnr;
        int                     baud_base;
        int                     custom_divisor;
-       int                     close_delay;
        int                     closing_wait;
-       int                     openwaitcnt;
        int                     rc;
        int                     argsize;
        void                    *argp;
@@ -88,7 +86,7 @@ struct stlibrd {
        unsigned long   magic;
        unsigned int    brdnr;
        unsigned int    brdtype;
-       unsigned int    state;
+       unsigned long   state;
        unsigned int    nrpanels;
        unsigned int    nrports;
        unsigned int    nrdevs;