Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[~andy/linux] / include / linux / ucb1400.h

diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index 5c75153f94414d37e64607d350f395549146881d..d21b33c4c6ca8a5ec5a858de75a0e2537dcf6bf3 100644 (file)
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -96,13 +96,11 @@ struct ucb1400_gpio {
 
 struct ucb1400_ts {
        struct input_dev        *ts_idev;
-       struct task_struct      *ts_task;
        int                     id;
-       wait_queue_head_t       ts_wait;
-       unsigned int            ts_restart:1;
        int                     irq;
-       unsigned int            irq_pending;    /* not bit field shared */
        struct snd_ac97         *ac97;
+       wait_queue_head_t       ts_wait;
+       bool                    stopped;
 };
 
 struct ucb1400 {