diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 07:54:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 07:54:38 -0700 |
| commit | 0b887d037bf4b76eec1c960e5feecd6a5a806971 (patch) | |
| tree | 8d4bd6b0f8d33684758f573db0de986616b5daa2 /include/linux/input.h | |
| parent | d1caeb02b17c6bc215a9a40a98a1beb92dcbd310 (diff) | |
| parent | 136c4bbfe69336cd1d0b076cfc0ef6b92d576a19 (diff) | |
| download | op-kernel-dev-0b887d037bf4b76eec1c960e5feecd6a5a806971.zip op-kernel-dev-0b887d037bf4b76eec1c960e5feecd6a5a806971.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (30 commits)
ACPI: work around duplicate name "VID" problem on T61
acpiphp_ibm: add missing '\n' to error message
ACPI: add dump_stack() to trace acpi_format_exception programming errors
make drivers/acpi/scan.c:create_modalias() static
ACPI: Fix a warning of discarding qualifiers from pointer target type
ACPI: "ACPI handle has no context!" should be KERN_DEBUG
ACPI video hotkey: export missing ACPI video hotkey events via input layer
ACPI: Validate XSDT, use RSDT if XSDT fails
ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such
ACPI: fix ia64 allnoconfig build
PNP: remove null pointer checks
PNP: remove MODULE infrastructure
ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG
PNPACPI: remove unnecessary casts of "void *"
PNPACPI: simplify irq_flags()
PNP: fix up after Lindent
ACPI: enable GPEs before calling _WAK on resume
asus-laptop: Fix rmmod of asus_laptop
sony-laptop: call sonypi_compat_init earlier
sony-laptop: enable Vaio FZ events
...
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index e02c6a6..cf2b561 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -363,6 +363,12 @@ struct input_absinfo { #define KEY_UNKNOWN 240 +#define KEY_VIDEO_NEXT 241 /* drive next video source */ +#define KEY_VIDEO_PREV 242 /* drive previous video source */ +#define KEY_BRIGHTNESS_CYCLE 243 /* brightness up, after max is min */ +#define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ +#define KEY_DISPLAY_OFF 245 /* display device to off state */ + #define BTN_MISC 0x100 #define BTN_0 0x100 #define BTN_1 0x101 |
