projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
[powerpc.git]
/
include
/
asm-cris
/
types.h
diff --git
a/include/asm-cris/types.h
b/include/asm-cris/types.h
index
8fa6d6c
..
5a21c42
100644
(file)
--- a/
include/asm-cris/types.h
+++ b/
include/asm-cris/types.h
@@
-19,9
+19,9
@@
typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__)
&& !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+
__extension__
typedef __signed__ long long __s64;
+
__extension__
typedef unsigned long long __u64;
#endif
#endif /* __ASSEMBLY__ */
#endif
#endif /* __ASSEMBLY__ */
@@
-52,8
+52,6
@@
typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;
typedef u32 dma_addr_t;
typedef u32 dma64_addr_t;
-typedef unsigned short kmem_bufctl_t;
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */