diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 18:55:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 18:55:00 -0700 |
| commit | d942492e1dbce264435daaf40f5742e1aaa5adaf (patch) | |
| tree | a45e29a47e2310dfbe2dfb0a966fbd5120ff1b7e | |
| parent | e04582b7bc70b40c57287cdc24f81964ee88f565 (diff) | |
| parent | b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 (diff) | |
| download | linux-3.10-d942492e1dbce264435daaf40f5742e1aaa5adaf.tar.gz linux-3.10-d942492e1dbce264435daaf40f5742e1aaa5adaf.tar.bz2 linux-3.10-d942492e1dbce264435daaf40f5742e1aaa5adaf.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
[HEADERS] Put linux/config.h out of its misery.
| -rw-r--r-- | arch/powerpc/platforms/82xx/mpc82xx.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/82xx/mpc82xx_ads.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/82xx/pq2ads.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe_io.c | 1 | ||||
| -rw-r--r-- | include/linux/config.h | 9 |
5 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c index 89d702de486..0f5b30dc60d 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx.c +++ b/arch/powerpc/platforms/82xx/mpc82xx.c @@ -11,7 +11,6 @@ * option) any later version. */ -#include <linux/config.h> #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/init.h> diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c index 0cea42a8053..bb9acbb9817 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c +++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c @@ -12,8 +12,6 @@ * option) any later version. */ - -#include <linux/config.h> #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/init.h> diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h index a7348213508..fb2f92bcd77 100644 --- a/arch/powerpc/platforms/82xx/pq2ads.h +++ b/arch/powerpc/platforms/82xx/pq2ads.h @@ -22,8 +22,6 @@ #ifndef __MACH_ADS8260_DEFS #define __MACH_ADS8260_DEFS -#include <linux/config.h> - #include <asm/ppcboot.h> /* For our show_cpuinfo hooks. */ diff --git a/arch/powerpc/sysdev/qe_lib/qe_io.c b/arch/powerpc/sysdev/qe_lib/qe_io.c index aea43597038..0afe6bfe371 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_io.c +++ b/arch/powerpc/sysdev/qe_lib/qe_io.c @@ -14,7 +14,6 @@ * option) any later version. */ -#include <linux/config.h> #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/init.h> diff --git a/include/linux/config.h b/include/linux/config.h deleted file mode 100644 index 479ffb0a22d..00000000000 --- a/include/linux/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _LINUX_CONFIG_H -#define _LINUX_CONFIG_H -/* This file is no longer in use and kept only for backward compatibility. - * autoconf.h is now included via -imacros on the commandline - */ -#warning Including config.h is deprecated. -#include <linux/autoconf.h> - -#endif |