diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-31 17:34:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-31 17:34:11 +1100 |
| commit | 2a0694913d559862b96c887f9a27f6fe8fa44b9b (patch) | |
| tree | 7398b6a3446af99ec45d3f4117aabf3b601ad17c /arch/m32r | |
| parent | 74cdcb2e104f4ca4bfb7c24afd36fdd3cbfa2f5c (diff) | |
| parent | fb5abcd2652315b6094250254a73ae5089fab487 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/acpi.h
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index bebdc36ebb0a..2b58c5f0bc38 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@ -3,3 +3,4 @@ generic-y += clkdev.h generic-y += exec.h generic-y += module.h generic-y += trace_clock.h +generic-y += preempt.h |