aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-06 19:59:14 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-06 19:59:14 -0500
commit0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (patch)
treec20e0f16d34c4d1197dc465fa3bdcf8b181af924 /include
parent6adfd34e85d6ddcf56a652a3dccb26f76aff8fd9 (diff)
parentab919c06144cfb11c05b5b5cd291daa96ac2e423 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'include')
-rw-r--r--include/linux/config.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/config.h b/include/linux/config.h
index 9d1c14f7ad6d..a91f5e55b525 100644
--- a/include/linux/config.h
+++ b/include/linux/config.h
@@ -1,6 +1,8 @@
1#ifndef _LINUX_CONFIG_H 1#ifndef _LINUX_CONFIG_H
2#define _LINUX_CONFIG_H 2#define _LINUX_CONFIG_H
3 3/* This file is no longer in use and kept only for backward compatibility.
4 * autoconf.h is now included via -imacros on the commandline
5 */
4#include <linux/autoconf.h> 6#include <linux/autoconf.h>
5 7
6#endif 8#endif