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 git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
types.h
diff --git
a/arch/s390/include/asm/types.h
b/arch/s390/include/asm/types.h
index
04d6b95
..
eeb52cc
100644
(file)
--- a/
arch/s390/include/asm/types.h
+++ b/
arch/s390/include/asm/types.h
@@
-30,14
+30,6
@@
typedef __signed__ long saddr_t;
#ifndef __ASSEMBLY__
-typedef u64 dma64_addr_t;
-#ifdef __s390x__
-/* DMA addresses come in 32-bit and 64-bit flavours. */
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
-
#ifndef __s390x__
typedef union {
unsigned long long pair;