Linux Kernel abolished include/linux/config.h long time ago. (around version v2.6.18..v2.6.19)
We don't need to provide Linux copatibility any more.
This commit deletes include/linux/config.h and fixes source files not to include this.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com --- arch/arm/include/asm/arch-pxa/hardware.h | 1 - arch/arm/include/asm/arch-s3c24x0/memory.h | 3 --- arch/arm/include/asm/atomic.h | 2 -- arch/arm/include/asm/memory.h | 1 - arch/arm/include/asm/proc-armv/ptrace.h | 2 -- arch/arm/include/asm/proc-armv/system.h | 2 -- arch/blackfin/include/asm/bitops.h | 1 - arch/m68k/include/asm/bitops.h | 1 - arch/microblaze/include/asm/bitops.h | 1 - arch/mips/include/asm/bitops.h | 1 - arch/mips/include/asm/io.h | 1 - arch/mips/include/asm/processor.h | 2 -- arch/mips/include/asm/system.h | 1 - arch/powerpc/cpu/mpc5xx/start.S | 1 - arch/powerpc/include/asm/atomic.h | 2 -- arch/powerpc/include/asm/bitops.h | 1 - arch/powerpc/include/asm/cache.h | 1 - arch/powerpc/include/asm/io.h | 1 - arch/powerpc/include/asm/mmu.h | 2 -- arch/powerpc/include/asm/processor.h | 2 -- arch/powerpc/include/asm/ptrace.h | 2 -- arch/sparc/include/asm/cache.h | 1 - arch/sparc/include/asm/page.h | 1 - board/hymod/hymod.h | 1 - include/commproc.h | 1 - include/linux/config.h | 6 ------ include/linux/linkage.h | 1 - include/linux/types.h | 4 ---- 28 files changed, 46 deletions(-) delete mode 100644 include/linux/config.h
diff --git a/arch/arm/include/asm/arch-pxa/hardware.h b/arch/arm/include/asm/arch-pxa/hardware.h index 2397bce..e671c14 100644 --- a/arch/arm/include/asm/arch-pxa/hardware.h +++ b/arch/arm/include/asm/arch-pxa/hardware.h @@ -18,7 +18,6 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H
-#include <linux/config.h> #include <asm/mach-types.h>
/* diff --git a/arch/arm/include/asm/arch-s3c24x0/memory.h b/arch/arm/include/asm/arch-s3c24x0/memory.h index 61d6270..d6a787b 100644 --- a/arch/arm/include/asm/arch-s3c24x0/memory.h +++ b/arch/arm/include/asm/arch-s3c24x0/memory.h @@ -32,9 +32,6 @@ */ #define PHYS_OFFSET (0x0c000000UL)
-#include <linux/config.h> - - /* Modified for S3C2400, by chc, 20010509 */ #define RAM_IN_BANK_0 32*1024*1024 #define RAM_IN_BANK_1 0 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index ba9e4b7..1b22eeb 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h @@ -16,8 +16,6 @@ #ifndef __ASM_ARM_ATOMIC_H #define __ASM_ARM_ATOMIC_H
-#include <linux/config.h> - #ifdef CONFIG_SMP #error SMP not supported #endif diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index c3b2afd..1864ab9 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -14,7 +14,6 @@
#if 0 /* XXX###XXX */
-#include <linux/config.h> #include <asm/arch/memory.h>
/* diff --git a/arch/arm/include/asm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h index 79cc644..a060ee6 100644 --- a/arch/arm/include/asm/proc-armv/ptrace.h +++ b/arch/arm/include/asm/proc-armv/ptrace.h @@ -10,8 +10,6 @@ #ifndef __ASM_PROC_PTRACE_H #define __ASM_PROC_PTRACE_H
-#include <linux/config.h> - #define USR26_MODE 0x00 #define FIQ26_MODE 0x01 #define IRQ26_MODE 0x02 diff --git a/arch/arm/include/asm/proc-armv/system.h b/arch/arm/include/asm/proc-armv/system.h index b4cfa68..cda8976 100644 --- a/arch/arm/include/asm/proc-armv/system.h +++ b/arch/arm/include/asm/proc-armv/system.h @@ -10,8 +10,6 @@ #ifndef __ASM_PROC_SYSTEM_H #define __ASM_PROC_SYSTEM_H
-#include <linux/config.h> - /* * Save the current interrupt enable state & disable IRQs */ diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h index b58b005..cd7e356 100644 --- a/arch/blackfin/include/asm/bitops.h +++ b/arch/blackfin/include/asm/bitops.h @@ -13,7 +13,6 @@ * Copyright 1992, Linus Torvalds. */
-#include <linux/config.h> #include <asm/byteorder.h> #include <asm/system.h>
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 525d90c..f9c434b 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -5,7 +5,6 @@ #ifndef _M68K_BITOPS_H #define _M68K_BITOPS_H
-#include <linux/config.h> #include <asm/byteorder.h>
extern void set_bit(int nr, volatile void *addr); diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h index eafa2b5..0ac78d7 100644 --- a/arch/microblaze/include/asm/bitops.h +++ b/arch/microblaze/include/asm/bitops.h @@ -5,7 +5,6 @@ * Copyright 1992, Linus Torvalds. */
-#include <linux/config.h> #include <asm/byteorder.h> /* swab32 */ #include <asm/system.h> /* save_flags */
diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h index f2dc533..b5c2a63 100644 --- a/arch/mips/include/asm/bitops.h +++ b/arch/mips/include/asm/bitops.h @@ -16,7 +16,6 @@
#include <asm/sgidefs.h> #include <asm/system.h> -#include <linux/config.h>
/* * clear_bit() doesn't provide any barrier for the compiler. diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index 50a882c..3fa37f5 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -11,7 +11,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H
-#include <linux/config.h> #if 0 #include <linux/pagemap.h> #endif diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 24858dd..ba7f538 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h @@ -11,8 +11,6 @@ #ifndef _ASM_PROCESSOR_H #define _ASM_PROCESSOR_H
-#include <linux/config.h> - #include <asm/isadep.h>
#include <asm/cachectl.h> diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h index b6d50e2..7a28952 100644 --- a/arch/mips/include/asm/system.h +++ b/arch/mips/include/asm/system.h @@ -16,7 +16,6 @@ #ifndef _ASM_SYSTEM_H #define _ASM_SYSTEM_H
-#include <linux/config.h> #include <asm/sgidefs.h> #include <asm/ptrace.h> #if 0 diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index bdd46d9..92f956d 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -25,7 +25,6 @@ #include <ppc_asm.tmpl> #include <ppc_defs.h>
-#include <linux/config.h> #include <asm/processor.h> #include <asm/u-boot.h>
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index 23f22df..43a2bb2 100644 --- a/arch/powerpc/include/asm/atomic.h +++ b/arch/powerpc/include/asm/atomic.h @@ -5,8 +5,6 @@ #ifndef _ASM_PPC_ATOMIC_H_ #define _ASM_PPC_ATOMIC_H_
-#include <linux/config.h> - #ifdef CONFIG_SMP typedef struct { volatile int counter; } atomic_t; #else diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h index adaf091..a6bcf3c 100644 --- a/arch/powerpc/include/asm/bitops.h +++ b/arch/powerpc/include/asm/bitops.h @@ -5,7 +5,6 @@ #ifndef _PPC_BITOPS_H #define _PPC_BITOPS_H
-#include <linux/config.h> #include <asm/byteorder.h>
extern void set_bit(int nr, volatile void *addr); diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index 5f9c640..cdc1f10 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -4,7 +4,6 @@ #ifndef __ARCH_PPC_CACHE_H #define __ARCH_PPC_CACHE_H
-#include <linux/config.h> #include <asm/processor.h>
/* bytes per L1 cache line */ diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 1f12c29..d8b7b97 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -7,7 +7,6 @@ #ifndef _PPC_IO_H #define _PPC_IO_H
-#include <linux/config.h> #include <asm/byteorder.h>
#ifdef CONFIG_ADDR_MAP diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index b700a3a..cadaeef 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -5,8 +5,6 @@ #ifndef _PPC_MMU_H_ #define _PPC_MMU_H_
-#include <linux/config.h> - #ifndef __ASSEMBLY__ /* Hardware Page Table Entry */ typedef struct _PTE { diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index c0fb519..81f9d38 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -7,8 +7,6 @@ */ #define current_text_addr() ({ __label__ _l; _l: &&_l;})
-#include <linux/config.h> - #include <asm/ptrace.h> #include <asm/types.h>
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index cf09edf..2d56de6 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h @@ -17,8 +17,6 @@ * the PT_* values below. This simplifies arch/powerpc/kernel/ptrace.c. */
-#include <linux/config.h> - #ifndef __ASSEMBLY__ #ifdef CONFIG_PPC64BRIDGE #define PPC_REG unsigned long /*long*/ diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h index 8ee0976..d9671d1 100644 --- a/arch/sparc/include/asm/cache.h +++ b/arch/sparc/include/asm/cache.h @@ -8,7 +8,6 @@ #ifndef __SPARC_CACHE_H__ #define __SPARC_CACHE_H__
-#include <linux/config.h> #include <asm/processor.h>
/* diff --git a/arch/sparc/include/asm/page.h b/arch/sparc/include/asm/page.h index ecc0dc5..181d1c1 100644 --- a/arch/sparc/include/asm/page.h +++ b/arch/sparc/include/asm/page.h @@ -10,7 +10,6 @@ #ifndef _SPARC_PAGE_H #define _SPARC_PAGE_H
-#include <linux/config.h> #ifdef CONFIG_SUN4 #define PAGE_SHIFT 13 #else diff --git a/board/hymod/hymod.h b/board/hymod/hymod.h index 2c58bfb..3ab3794 100644 --- a/board/hymod/hymod.h +++ b/board/hymod/hymod.h @@ -8,7 +8,6 @@ #ifndef _HYMOD_H_ #define _HYMOD_H_
-#include <linux/config.h> #ifdef CONFIG_8260 #include <asm/iopin_8260.h> #endif diff --git a/include/commproc.h b/include/commproc.h index 6959905..c10a79c 100644 --- a/include/commproc.h +++ b/include/commproc.h @@ -20,7 +20,6 @@ #ifndef __CPM_8XX__ #define __CPM_8XX__
-#include <linux/config.h> #include <asm/8xx_immap.h>
/* CPM Command register. diff --git a/include/linux/config.h b/include/linux/config.h deleted file mode 100644 index a0194cb..0000000 --- a/include/linux/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _LINUX_CONFIG_H -#define _LINUX_CONFIG_H - -/* #include <linux/autoconf.h> */ - -#endif diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 9ddf830..39c712e 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -10,7 +10,6 @@ #define _LINUX_LINKAGE_H
#include <asm/linkage.h> -#include <linux/config.h>
#ifdef __cplusplus #define CPP_ASMLINKAGE extern "C" diff --git a/include/linux/types.h b/include/linux/types.h index f07ba41..9aebc4e 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -1,10 +1,6 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H
-#ifdef __KERNEL__ -#include <linux/config.h> -#endif - #include <linux/posix_types.h> #include <asm/types.h> #include <stdbool.h>