aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 07:23:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 07:23:42 -0800
commit5a865c0606eb44d5d12cabb429751c83712183de (patch)
tree726d6eaf3b20f30900304bd0cbb6339b423a071f /arch/cris/include
parent331d9d5958277de27e6ce42247e1cbec54fd1c7e (diff)
parent46e75f66677f5094bb51e91f9473128c4e907c7d (diff)
downloadlinux-2.6.38-lt-ux500-5a865c0606eb44d5d12cabb429751c83712183de.tar.gz
Merge branch 'for-33' of git://repo.or.cz/linux-kbuild
* 'for-33' of git://repo.or.cz/linux-kbuild: (29 commits) net: fix for utsrelease.h moving to generated gen_init_cpio: fixed fwrite warning kbuild: fix make clean after mismerge kbuild: generate modules.builtin genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}() score: add asm/asm-offsets.h wrapper unifdef: update to upstream revision 1.190 kbuild: specify absolute paths for cscope kbuild: create include/generated in silentoldconfig scripts/package: deb-pkg: use fakeroot if available scripts/package: add KBUILD_PKG_ROOTCMD variable scripts/package: tar-pkg: use tar --owner=root Kbuild: clean up marker net: add net_tstamp.h to headers_install kbuild: move utsrelease.h to include/generated kbuild: move autoconf.h to include/generated drop explicit include of autoconf.h kbuild: move compile.h to include/generated kbuild: drop include/asm kbuild: do not check for include/asm-$ARCH ... Fixed non-conflicting clean merge of modpost.c as per comments from Stephen Rothwell (modpost.c had grown an include of linux/autoconf.h that needed to be changed to generated/autoconf.h)
Diffstat (limited to 'arch/cris/include')
-rw-r--r--arch/cris/include/asm/asm-offsets.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/asm-offsets.h b/arch/cris/include/asm/asm-offsets.h
new file mode 100644
index 00000000000..d370ee36a18
--- /dev/null
+++ b/arch/cris/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>