diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 09:58:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 09:58:14 -0800 |
| commit | d24450e2075b9ceeef8ad942e6391bc73eae6933 (patch) | |
| tree | f8966325219aa28089f9d3dc944433c5658168ab /include/linux/input | |
| parent | decompressors: remove unused constant from inflate.h (diff) | |
| parent | Merge branch 'next' into for-linus (diff) | |
| download | linux-dev-d24450e2075b9ceeef8ad942e6391bc73eae6933.tar.xz linux-dev-d24450e2075b9ceeef8ad942e6391bc73eae6933.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: add SW_ROTATE_LOCK switch type
Input: fix force feedback capability query example
Input: wacom_w8001 - add single-touch support
Input: add Austria Microsystem AS5011 joystick driver
Input: remove aaed2000 keyboard driver
Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13
Input: cy8ctmg110_ts - Convert to dev_pm_ops
Input: migor_ts - convert to dev_pm_ops
Input: mcs5000_ts - convert to dev_pm_ops
Input: eeti_ts - convert to dev_pm_ops
Input: ad7879 - convert I2C to dev_pm_ops
Diffstat (limited to 'include/linux/input')
| -rw-r--r-- | include/linux/input/as5011.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/input/as5011.h b/include/linux/input/as5011.h new file mode 100644 index 000000000000..1affd0ddfa9d --- /dev/null +++ b/include/linux/input/as5011.h @@ -0,0 +1,20 @@ +#ifndef _AS5011_H +#define _AS5011_H + +/* + * Copyright (c) 2010, 2011 Fabien Marteau <fabien.marteau@armadeus.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + */ + +struct as5011_platform_data { + unsigned int button_gpio; + unsigned int axis_irq; /* irq number */ + unsigned long axis_irqflags; + char xp, xn; /* threshold for x axis */ + char yp, yn; /* threshold for y axis */ +}; + +#endif /* _AS5011_H */ |