diff options
author | Tony Lindgren <tony@atomide.com> | 2015-09-14 22:42:11 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 22:42:11 +0200 |
commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /arch/powerpc/include/asm/Kbuild | |
parent | ARM: omap2plus_defconfig: Enable MUSB DMA support (diff) | |
parent | ARM: dts: Fixup model name for HP t410 dts (diff) | |
download | linux-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz linux-7168e947291f0ead07e5638b4599fb7845288b69.zip |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'arch/powerpc/include/asm/Kbuild')
-rw-r--r-- | arch/powerpc/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 050712e1ce41..ab9f4e0ed4cf 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -6,5 +6,4 @@ generic-y += local64.h generic-y += mcs_spinlock.h generic-y += preempt.h generic-y += rwsem.h -generic-y += trace_clock.h generic-y += vtime.h |