diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:12:36 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:12:36 -0400 |
| commit | 2fca877b68b2b4fc5b94277858a1bedd46017cde (patch) | |
| tree | fd02725406299ba2f26354463b3c261721e9eb6b /include/linux/input.h | |
| parent | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (diff) | |
| parent | 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b (diff) | |
| download | cachepc-linux-2fca877b68b2b4fc5b94277858a1bedd46017cde.tar.gz cachepc-linux-2fca877b68b2b4fc5b94277858a1bedd46017cde.zip | |
/spare/repo/libata-dev branch 'v2.6.13'
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 9d9598ed760d..bdc53c6cc962 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -811,9 +811,9 @@ struct input_dev { void *private; - char *name; - char *phys; - char *uniq; + const char *name; + const char *phys; + const char *uniq; struct input_id id; unsigned long evbit[NBITS(EV_MAX)]; @@ -859,6 +859,10 @@ struct input_dev { int (*erase_effect)(struct input_dev *dev, int effect_id); struct input_handle *grab; + + struct semaphore sem; /* serializes open and close operations */ + unsigned int users; + struct device *dev; struct list_head h_list; |