Commit d942492e authored Oct 09, 2006 by Linus Torvalds

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.

parents e04582b7 b0ac3f50

arch/powerpc/platforms/82xx/mpc82xx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@
		* option) any later version.
		*/

		#include <linux/config.h>
		#include <linux/stddef.h>
		#include <linux/kernel.h>
		#include <linux/init.h>

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -12,8 +12,6 @@
		* option) any later version.
		*/


		#include <linux/config.h>
		#include <linux/stddef.h>
		#include <linux/kernel.h>
		#include <linux/init.h>

arch/powerpc/platforms/82xx/pq2ads.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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. */

arch/powerpc/sysdev/qe_lib/qe_io.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		* option) any later version.
		*/

		#include <linux/config.h>
		#include <linux/stddef.h>
		#include <linux/kernel.h>
		#include <linux/init.h>

include/linux/config.h

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		#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