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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
types.h
diff --git
a/arch/mips/include/asm/types.h
b/arch/mips/include/asm/types.h
index
544a285
..
533812b
100644
(file)
--- a/
arch/mips/include/asm/types.h
+++ b/
arch/mips/include/asm/types.h
@@
-33,14
+33,6
@@
typedef unsigned short umode_t;
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
-#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
- || defined(CONFIG_64BIT)
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
-typedef u64 dma64_addr_t;
-
/*
* Don't use phys_t. You've been warned.
*/
/*
* Don't use phys_t. You've been warned.
*/