summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/Kbuild
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-10-12 15:09:06 +0200
committerMichal Marek <mmarek@suse.cz>2010-10-12 15:09:06 +0200
commit239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch)
tree77f79810e57d4fc24356eca0cd6db463e8994128 /arch/s390/include/asm/Kbuild
parent1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff)
parente9203c988234aa512bd45ca32b52e21c7bbfc414 (diff)
downloadop-kernel-dev-239060b93bb30a4ad55f1ecaa512464a035cc5ba.zip
op-kernel-dev-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.gz
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/s390/include/asm/Kbuild')
-rw-r--r--arch/s390/include/asm/Kbuild11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 63a2341..42e512b 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,15 +1,14 @@
include include/asm-generic/Kbuild.asm
+header-y += chpid.h
+header-y += chsc.h
+header-y += cmb.h
header-y += dasd.h
+header-y += debug.h
header-y += monwriter.h
header-y += qeth.h
+header-y += schid.h
header-y += tape390.h
header-y += ucontext.h
header-y += vtoc.h
header-y += zcrypt.h
-header-y += chsc.h
-
-unifdef-y += cmb.h
-unifdef-y += debug.h
-unifdef-y += chpid.h
-unifdef-y += schid.h
OpenPOWER on IntegriCloud