diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/asm-mips/sn/arch.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/asm-mips/sn/arch.h')
| -rw-r--r-- | include/asm-mips/sn/arch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h index d247a819de7f..51174af6ac52 100644 --- a/include/asm-mips/sn/arch.h +++ b/include/asm-mips/sn/arch.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SN_ARCH_H | 11 | #ifndef _ASM_SN_ARCH_H |
| 12 | #define _ASM_SN_ARCH_H | 12 | #define _ASM_SN_ARCH_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <asm/sn/types.h> | 15 | #include <asm/sn/types.h> |
| 17 | #ifdef CONFIG_SGI_IP27 | 16 | #ifdef CONFIG_SGI_IP27 |