diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-02-11 11:33:33 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-02-11 11:33:33 +0100 |
commit | 7980033bea8a74692fdb987c44ec91b0be8e752b (patch) | |
tree | 02b57329465d397b3a20468a683e56d1cda88cf6 /arch/sparc/include/asm/Kbuild | |
parent | x86/cpufeature: Update _static_cpu_has() to use all named variables (diff) | |
parent | Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux (diff) | |
download | linux-7980033bea8a74692fdb987c44ec91b0be8e752b.tar.xz linux-7980033bea8a74692fdb987c44ec91b0be8e752b.zip |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/include/asm/Kbuild')
-rw-r--r-- | arch/sparc/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 80ddc01f57ac..ac67828da201 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -1,7 +1,6 @@ # User exported sparc header files -generic-y += clkdev.h generic-y += div64.h generic-y += emergency-restart.h generic-y += exec.h |