diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-13 14:14:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-13 14:14:29 +0200 |
| commit | ce4524e5a78123fbf2db5b1549798c91a6d98294 (patch) | |
| tree | fc6450c80af14542f8bdb6b4726674669d259969 /include/uapi | |
| parent | f2aa111041ce36b94e651d882458dea502e76721 (diff) | |
| parent | 7667428f80526d908124e0647ac5dbe3dad88900 (diff) | |
| download | linux-ce4524e5a78123fbf2db5b1549798c91a6d98294.tar.gz linux-ce4524e5a78123fbf2db5b1549798c91a6d98294.tar.bz2 linux-ce4524e5a78123fbf2db5b1549798c91a6d98294.zip | |
Merge tag 'asoc-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.1
More updates for v4.1, pretty much all drivers:
- Lots of cleanups from Lars, mainly moving things from the CODEC level
to the card level.
- Continuing improvements to rcar from Morimoto-san, pcm512x from
Howard and Peter, the Intel platforms from Vinod, Jie, Jin and Han,
and to rt5670 from Bard.
- Support for some non-DSP Qualcomm platforms, Google's Storm
platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/input.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/nfsd/export.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index b0a813079852..2f62ab2d7bf9 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -973,7 +973,8 @@ struct input_keymap_entry { */ #define MT_TOOL_FINGER 0 #define MT_TOOL_PEN 1 -#define MT_TOOL_MAX 1 +#define MT_TOOL_PALM 2 +#define MT_TOOL_MAX 2 /* * Values describing the status of a force-feedback effect diff --git a/include/uapi/linux/nfsd/export.h b/include/uapi/linux/nfsd/export.h index 4742f2cb42f2..d3bd6ffec041 100644 --- a/include/uapi/linux/nfsd/export.h +++ b/include/uapi/linux/nfsd/export.h @@ -47,7 +47,7 @@ * exported filesystem. */ #define NFSEXP_V4ROOT 0x10000 -#define NFSEXP_NOPNFS 0x20000 +#define NFSEXP_PNFS 0x20000 /* All flags that we claim to support. (Note we don't support NOACL.) */ #define NFSEXP_ALLFLAGS 0x3FE7F |