diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 21:55:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 21:55:00 -0400 |
| commit | d942492e1dbce264435daaf40f5742e1aaa5adaf (patch) | |
| tree | a45e29a47e2310dfbe2dfb0a966fbd5120ff1b7e /arch | |
| parent | e04582b7bc70b40c57287cdc24f81964ee88f565 (diff) | |
| parent | b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 (diff) | |
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.
Diffstat (limited to 'arch')
| -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 |
4 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c index 89d702de4863..0f5b30dc60da 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx.c +++ b/arch/powerpc/platforms/82xx/mpc82xx.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c index 0cea42a8053d..bb9acbb98176 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c +++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | |||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/stddef.h> | 15 | #include <linux/stddef.h> |
| 18 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h index a7348213508f..fb2f92bcd770 100644 --- a/arch/powerpc/platforms/82xx/pq2ads.h +++ b/arch/powerpc/platforms/82xx/pq2ads.h | |||
| @@ -22,8 +22,6 @@ | |||
| 22 | #ifndef __MACH_ADS8260_DEFS | 22 | #ifndef __MACH_ADS8260_DEFS |
| 23 | #define __MACH_ADS8260_DEFS | 23 | #define __MACH_ADS8260_DEFS |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | |||
| 27 | #include <asm/ppcboot.h> | 25 | #include <asm/ppcboot.h> |
| 28 | 26 | ||
| 29 | /* For our show_cpuinfo hooks. */ | 27 | /* 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 aea435970389..0afe6bfe3714 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_io.c +++ b/arch/powerpc/sysdev/qe_lib/qe_io.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |