diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
| commit | d820306cbe56fb010f500ae58f9725f49812d39a (patch) | |
| tree | 1c9554107c7f279d05d6f54b1b5d69735d51195d /include/uapi | |
| parent | 6d5eba5aac4ec9bba3d6b3e6425d857706d12ccb (diff) | |
| parent | 39edac70e9aedf451fccaa851b273ace9fcca0bd (diff) | |
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix.
Conflicts:
sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'include/uapi')
| -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, |