summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 23:21:50 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 23:21:50 (GMT)
commit5d7cb157025b3b4852f38e6e5e97d06ef12c1d78 (patch)
tree09831b553687b51749ed99dbabaf3687a4e4bd2a /arch/arm
parentfc58fb180755cdeda3ce58776eef94a01b37a1c1 (diff)
parent8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7 (diff)
downloadlinux-fsl-qoriq-5d7cb157025b3b4852f38e6e5e97d06ef12c1d78.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup: defconfig reduction kbuild: drop unifdef-y support archs: replace unifdef-y with header-y include: replace unifdef-y with header-y
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 73237bd..6550db3 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,3 +1,3 @@
include include/asm-generic/Kbuild.asm
-unifdef-y += hwcap.h
+header-y += hwcap.h