diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-26 12:05:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-26 12:05:47 +0100 |
| commit | e8f00c1b01c8b547bd1e11754634ce1913c7cc72 (patch) | |
| tree | f50e57dc2ce4ca1a3f84b6c036c989b5491dc8c5 /include/uapi/linux | |
| parent | 9ff50721e47ab0abb8b93159170f67262886ef0d (diff) | |
| parent | 50d4a790e65f5ac91a7b2720a19e80e862b40318 (diff) | |
| download | cachepc-linux-e8f00c1b01c8b547bd1e11754634ce1913c7cc72.tar.gz cachepc-linux-e8f00c1b01c8b547bd1e11754634ce1913c7cc72.zip | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
Conflicts:
sound/soc/fsl/imx-sgtl5000.c
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index ca1d90bcb74d..40a1fb807396 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -324,7 +324,7 @@ struct perf_event_attr { #define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64) #define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5) #define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *) -#define PERF_EVENT_IOC_ID _IOR('$', 7, u64 *) +#define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *) enum perf_event_ioc_flags { PERF_IOC_FLAG_GROUP = 1U << 0, |