git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-mips
/
sn
/
arch.h
diff --git
a/include/asm-mips/sn/arch.h
b/include/asm-mips/sn/arch.h
index
d247a81
..
da523de
100644
(file)
--- a/
include/asm-mips/sn/arch.h
+++ b/
include/asm-mips/sn/arch.h
@@
-11,7
+11,6
@@
#ifndef _ASM_SN_ARCH_H
#define _ASM_SN_ARCH_H
#ifndef _ASM_SN_ARCH_H
#define _ASM_SN_ARCH_H
-#include <linux/config.h>
#include <linux/types.h>
#include <asm/sn/types.h>
#ifdef CONFIG_SGI_IP27
#include <linux/types.h>
#include <asm/sn/types.h>
#ifdef CONFIG_SGI_IP27
@@
-19,7
+18,6
@@
#endif
typedef u64 hubreg_t;
#endif
typedef u64 hubreg_t;
-typedef u64 nic_t;
#define cputonasid(cpu) (cpu_data[(cpu)].p_nasid)
#define cputoslice(cpu) (cpu_data[(cpu)].p_slice)
#define cputonasid(cpu) (cpu_data[(cpu)].p_nasid)
#define cputoslice(cpu) (cpu_data[(cpu)].p_slice)