diff options
author | Tony Lindgren <tony@atomide.com> | 2015-07-06 15:33:17 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-07-06 15:33:17 +0300 |
commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /arch/m68k/include/asm/Kbuild | |
parent | e3abe2556b2a689b28926cd1581f0b97e9d2afa4 (diff) | |
parent | 22a5dc10e3f8fb8370748ea19dc4e3e1620d8296 (diff) | |
download | linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.xz |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'arch/m68k/include/asm/Kbuild')
-rw-r--r-- | arch/m68k/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 1517ed1c6471..1555bc189c7d 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -23,7 +23,6 @@ generic-y += mutex.h generic-y += percpu.h generic-y += preempt.h generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h generic-y += shmparam.h generic-y += siginfo.h |