diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-16 19:09:30 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-16 19:09:30 +0400 |
| commit | 315fba80a664e4bd928e0b85a38d26e60645b96a (patch) | |
| tree | f978ad08f524b671d12b1116dc8bbdc57dd743d8 /include/uapi/linux | |
| parent | 356f402da0f989b16e4b6849e88dba5df0e25944 (diff) | |
| parent | c6affc0dba45bb2074ff56b21386d22eeaf682f8 (diff) | |
| download | linux-315fba80a664e4bd928e0b85a38d26e60645b96a.tar.xz | |
Merge tag 'asoc-v3.13-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A few small fixes in drivers, nothing too remarkable here but all good
to have - mainly these are fixes for things that were introduced in the
last merge window but only just got useful testing.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/input.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index ecc88592ecbe..bd24470d24a2 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -464,7 +464,8 @@ struct input_keymap_entry { #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ #define KEY_DISPLAY_OFF 245 /* display device to off state */ -#define KEY_WIMAX 246 +#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ +#define KEY_WIMAX KEY_WWAN #define KEY_RFKILL 247 /* Key that controls all radios */ #define KEY_MICMUTE 248 /* Mute / unmute the microphone */ diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index e1802d6153ae..959d454f76a1 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -679,6 +679,7 @@ enum perf_event_type { * * { u64 weight; } && PERF_SAMPLE_WEIGHT * { u64 data_src; } && PERF_SAMPLE_DATA_SRC + * { u64 transaction; } && PERF_SAMPLE_TRANSACTION * }; */ PERF_RECORD_SAMPLE = 9, |