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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-mips
/
types.h
diff --git
a/include/asm-mips/types.h
b/include/asm-mips/types.h
index
b949ab3
..
63a13c5
100644
(file)
--- a/
include/asm-mips/types.h
+++ b/
include/asm-mips/types.h
@@
-52,7
+52,6
@@
typedef unsigned long long __u64;
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-#include <linux/config.h>
typedef __signed char s8;
typedef unsigned char u8;
typedef __signed char s8;
typedef unsigned char u8;
@@
-78,7
+77,7
@@
typedef unsigned long long u64;
#endif
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
#endif
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
- || defined(CONFIG_
MIPS64
)
+ || defined(CONFIG_
64BIT
)
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;
@@
-94,11
+93,6
@@
typedef unsigned long long phys_t;
typedef unsigned long phys_t;
#endif
typedef unsigned long phys_t;
#endif
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */