diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-17 15:40:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-17 15:40:55 +0100 |
| commit | 6be7f5344b4fca35f1955aa73f0de825316a3236 (patch) | |
| tree | 25ccce9c837fbc7beef026b46852197b637be901 /tools/perf/arch/x86/include/perf_regs.h | |
| parent | df68f106436b684520212494a5ce0e3823b485da (diff) | |
| parent | 8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff) | |
| download | lwn-6be7f5344b4fca35f1955aa73f0de825316a3236.tar.gz lwn-6be7f5344b4fca35f1955aa73f0de825316a3236.zip | |
Merge tag 'asoc-3.8p1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.8
Nothing terribly exciting here, just small localised changes.
As well as fixes there are a couple of Cirrus changes and one devm_
change which were in prior to the merge window but got missed from the
original pull to Takashi.
Diffstat (limited to 'tools/perf/arch/x86/include/perf_regs.h')
| -rw-r--r-- | tools/perf/arch/x86/include/perf_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/x86/include/perf_regs.h b/tools/perf/arch/x86/include/perf_regs.h index 46fc9f15c6b3..7fcdcdbee917 100644 --- a/tools/perf/arch/x86/include/perf_regs.h +++ b/tools/perf/arch/x86/include/perf_regs.h @@ -3,7 +3,7 @@ #include <stdlib.h> #include "../../util/types.h" -#include "../../../../../arch/x86/include/asm/perf_regs.h" +#include <asm/perf_regs.h> #ifndef ARCH_X86_64 #define PERF_REGS_MASK ((1ULL << PERF_REG_X86_32_MAX) - 1) |