summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 14:55:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 14:55:52 -0700
commit398477d4bd57cc33792fd93035c2763ad78629c4 (patch)
tree8a9cc1cd2f371843f6242b877cbdce9e109a06ed /include/asm-cris/Kbuild
parent6e936d3e9a45a4307e7f4a29ee9829e7a0464af1 (diff)
parent6d71627581e96efb3717960b79fc2167a4617977 (diff)
downloadop-kernel-dev-398477d4bd57cc33792fd93035c2763ad78629c4.zip
op-kernel-dev-398477d4bd57cc33792fd93035c2763ad78629c4.tar.gz
Merge git://git.infradead.org/~dwmw2/khdrs-2.6
* git://git.infradead.org/~dwmw2/khdrs-2.6: New 'make headers_install_all' target. Use dependencies for 'make headers_install'. [S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place. Remove dead netfilter_logging.h from include/linux/Kbuild Remove offsetof() from user-visible <linux/stddef.h> Clean up exported headers on CRIS Fix v850 exported headers Don't advertise (or allow) headers_{install,check} where inappropriate. Remove UML header export Remove ARM26 header export. Fix H8300 exported headers. Fix m68knommu exported headers Fix exported headers for SPARC, SPARC64 Fix 'make headers_check' on m32r Fix 'make headers_check' on sh64 Fix 'make headers_check' on sh [HEADERS] Fix ARM 'make headers_check' Initial pass of manual conflict resolution in top-level Makefile over conflicting build rule and headers_install changes.
Diffstat (limited to 'include/asm-cris/Kbuild')
-rw-r--r--include/asm-cris/Kbuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
index c68e168..14498d5 100644
--- a/include/asm-cris/Kbuild
+++ b/include/asm-cris/Kbuild
@@ -1 +1,5 @@
include include/asm-generic/Kbuild.asm
+
+header-y += arch-v10/ arch-v32/
+
+unifdef-y += rs485.h
OpenPOWER on IntegriCloud