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/launch.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/launch.h')
| -rw-r--r-- | include/asm-mips/sn/launch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/sn/launch.h b/include/asm-mips/sn/launch.h index b67699c0c475..b7c2226312c6 100644 --- a/include/asm-mips/sn/launch.h +++ b/include/asm-mips/sn/launch.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SN_LAUNCH_H | 9 | #ifndef _ASM_SN_LAUNCH_H |
| 10 | #define _ASM_SN_LAUNCH_H | 10 | #define _ASM_SN_LAUNCH_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/sn/types.h> | 12 | #include <asm/sn/types.h> |
| 14 | #include <asm/sn/addrs.h> | 13 | #include <asm/sn/addrs.h> |
| 15 | 14 | ||