diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-05 02:33:22 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-05 02:33:22 +0300 |
| commit | 5958eed76ccc8c361f872829bdc4b8c6dc9cd379 (patch) | |
| tree | 8f8dfcced082db674b0ae3ca3af9fdb6dde59dae /drivers/input/mouse/alps.h | |
| parent | c7c17c2779075e675cb3c7fe2ecde67e226771fb (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| download | linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/input/mouse/alps.h')
| -rw-r--r-- | drivers/input/mouse/alps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index bc87936fee1a..904ed8b3c8be 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h @@ -23,6 +23,7 @@ struct alps_data { char phys[32]; /* Phys */ const struct alps_model_info *i;/* Info */ int prev_fin; /* Finger bit from previous packet */ + struct timer_list timer; }; #ifdef CONFIG_MOUSE_PS2_ALPS |