Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fefd26b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 4a61f173 038b0a6d

arch/alpha/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/a.out.h>

#include <linux/screen_info.h>

#include <linux/delay.h>

#include <linux/config.h>	/* CONFIG_ALPHA_LCA etc */

#include <linux/mc146818rtc.h>

#include <linux/console.h>

#include <linux/cpu.h>

arch/alpha/kernel/systbls.S

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 * The system call table. 

 */



#include <linux/config.h>			/* CONFIG_OSF4_COMPAT */

#include <asm/unistd.h>



	.data

arch/arm/kernel/crunch.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 */



#include <linux/module.h>

#include <linux/config.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/signal.h>

arch/arm/kernel/iwmmxt-notifier.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <linux/module.h>

#include <linux/config.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/signal.h>

arch/arm/mach-at91rm9200/board-1arm.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/config.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/mm.h>