diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /include/linux/input.h | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 9a6355f74db2..6b28048fc568 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <sys/time.h> | 16 | #include <sys/time.h> |
| 17 | #include <sys/ioctl.h> | 17 | #include <sys/ioctl.h> |
| 18 | #include <sys/types.h> | 18 | #include <sys/types.h> |
| 19 | #include <asm/types.h> | 19 | #include <linux/types.h> |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| @@ -661,6 +661,7 @@ struct input_absinfo { | |||
| 661 | #define SW_DOCK 0x05 /* set = plugged into dock */ | 661 | #define SW_DOCK 0x05 /* set = plugged into dock */ |
| 662 | #define SW_LINEOUT_INSERT 0x06 /* set = inserted */ | 662 | #define SW_LINEOUT_INSERT 0x06 /* set = inserted */ |
| 663 | #define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ | 663 | #define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ |
| 664 | #define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ | ||
| 664 | #define SW_MAX 0x0f | 665 | #define SW_MAX 0x0f |
| 665 | #define SW_CNT (SW_MAX+1) | 666 | #define SW_CNT (SW_MAX+1) |
| 666 | 667 | ||
