git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
types.h
diff --git
a/arch/alpha/include/asm/types.h
b/arch/alpha/include/asm/types.h
index
bd621ec
..
8815443
100644
(file)
--- a/
arch/alpha/include/asm/types.h
+++ b/
arch/alpha/include/asm/types.h
@@
-20,16
+20,4
@@
typedef unsigned int umode_t;
#endif /* __ASSEMBLY__ */
typedef unsigned int umode_t;
#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-typedef u64 dma_addr_t;
-typedef u64 dma64_addr_t;
-
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
#endif /* _ALPHA_TYPES_H */
#endif /* _ALPHA_TYPES_H */