diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-13 01:48:07 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 01:48:07 -0500 |
| commit | 6214b54cbf0778804de1297444c7661e70bc4d74 (patch) | |
| tree | 262a96d1be839a30e6e8d3f3452806b7f337148c /arch/s390/include/asm/perf_event.h | |
| parent | 05193639ca977cc889668718adb38db6d585045b (diff) | |
| parent | ba027da8eb309252cb611f23808da51487f68e12 (diff) | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
Diffstat (limited to 'arch/s390/include/asm/perf_event.h')
| -rw-r--r-- | arch/s390/include/asm/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h index 7941968e12b4..5f0173a31693 100644 --- a/arch/s390/include/asm/perf_event.h +++ b/arch/s390/include/asm/perf_event.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include <asm/cpu_mf.h> | 9 | #include <asm/cpu_mf.h> |
| 10 | 10 | ||
| 11 | /* CPU-measurement counter facility */ | 11 | /* CPU-measurement counter facility */ |
| 12 | #define PERF_CPUM_CF_MAX_CTR 160 | 12 | #define PERF_CPUM_CF_MAX_CTR 256 |
| 13 | 13 | ||
| 14 | /* Per-CPU flags for PMU states */ | 14 | /* Per-CPU flags for PMU states */ |
| 15 | #define PMU_F_RESERVED 0x1000 | 15 | #define PMU_F_RESERVED 0x1000 |