diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /drivers/input/mouse/alps.h | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
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 970480551b6e..eee59853b9ce 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #define ALPS_PROTO_V2 2 | 16 | #define ALPS_PROTO_V2 2 |
| 17 | #define ALPS_PROTO_V3 3 | 17 | #define ALPS_PROTO_V3 3 |
| 18 | #define ALPS_PROTO_V4 4 | 18 | #define ALPS_PROTO_V4 4 |
| 19 | #define ALPS_PROTO_V5 5 | ||
| 19 | 20 | ||
| 20 | /** | 21 | /** |
| 21 | * struct alps_model_info - touchpad ID table | 22 | * struct alps_model_info - touchpad ID table |