diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /arch/um/include | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
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.
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/mconsole_kern.h | 1 | ||||
| -rw-r--r-- | arch/um/include/mode_kern.h | 2 | ||||
| -rw-r--r-- | arch/um/include/skas/mmu-skas.h | 1 | ||||
| -rw-r--r-- | arch/um/include/sysdep-ppc/ptrace.h | 1 | ||||
| -rw-r--r-- | arch/um/include/um_uaccess.h | 1 |
5 files changed, 0 insertions, 6 deletions
diff --git a/arch/um/include/mconsole_kern.h b/arch/um/include/mconsole_kern.h index d86ee14260c..d0b690197fd 100644 --- a/arch/um/include/mconsole_kern.h +++ b/arch/um/include/mconsole_kern.h @@ -6,7 +6,6 @@ #ifndef __MCONSOLE_KERN_H__ #define __MCONSOLE_KERN_H__ -#include "linux/config.h" #include "linux/list.h" #include "mconsole.h" diff --git a/arch/um/include/mode_kern.h b/arch/um/include/mode_kern.h index e7539a8451e..88e5e77bf51 100644 --- a/arch/um/include/mode_kern.h +++ b/arch/um/include/mode_kern.h @@ -6,8 +6,6 @@ #ifndef __MODE_KERN_H__ #define __MODE_KERN_H__ -#include "linux/config.h" - #ifdef CONFIG_MODE_TT #include "mode_kern_tt.h" #endif diff --git a/arch/um/include/skas/mmu-skas.h b/arch/um/include/skas/mmu-skas.h index d8869a6ef1b..b26986c0c3d 100644 --- a/arch/um/include/skas/mmu-skas.h +++ b/arch/um/include/skas/mmu-skas.h @@ -6,7 +6,6 @@ #ifndef __SKAS_MMU_H #define __SKAS_MMU_H -#include "linux/config.h" #include "mm_id.h" #include "asm/ldt.h" diff --git a/arch/um/include/sysdep-ppc/ptrace.h b/arch/um/include/sysdep-ppc/ptrace.h index 8a27353733a..df2397dba3e 100644 --- a/arch/um/include/sysdep-ppc/ptrace.h +++ b/arch/um/include/sysdep-ppc/ptrace.h @@ -5,7 +5,6 @@ #ifndef __SYS_PTRACE_PPC_H #define __SYS_PTRACE_PPC_H -#include "linux/config.h" #include "linux/types.h" /* the following taken from <asm-ppc/ptrace.h> */ diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h index 4567f1eeb4a..5126a99b596 100644 --- a/arch/um/include/um_uaccess.h +++ b/arch/um/include/um_uaccess.h @@ -6,7 +6,6 @@ #ifndef __ARCH_UM_UACCESS_H #define __ARCH_UM_UACCESS_H -#include "linux/config.h" #include "choose-mode.h" #ifdef CONFIG_MODE_TT |