projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
include
/
asm-m32r
/
types.h
diff --git
a/include/asm-m32r/types.h
b/include/asm-m32r/types.h
index
fcf24c6
..
27d3eb5
100644
(file)
--- a/
include/asm-m32r/types.h
+++ b/
include/asm-m32r/types.h
@@
-3,10
+3,6
@@
#ifndef __ASSEMBLY__
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
typedef unsigned short umode_t;
/*
@@
-59,4
+55,4
@@
typedef u64 dma64_addr_t;
#endif /* __KERNEL__ */
-#endif
/* _ASM_M32R_TYPES_H */
+#endif /* _ASM_M32R_TYPES_H */