diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /include/linux | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/config.h b/include/linux/config.h index a91f5e55b525..479ffb0a22d8 100644 --- a/include/linux/config.h +++ b/include/linux/config.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | /* This file is no longer in use and kept only for backward compatibility. | 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 | 4 | * autoconf.h is now included via -imacros on the commandline |
| 5 | */ | 5 | */ |
| 6 | #warning Including config.h is deprecated. | ||
| 6 | #include <linux/autoconf.h> | 7 | #include <linux/autoconf.h> |
| 7 | 8 | ||
| 8 | #endif | 9 | #endif |