git.samba.org
/
sfrench
/
cifs-2.6.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
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
include
/
asm
/
scatterlist.h
diff --git
a/arch/parisc/include/asm/scatterlist.h
b/arch/parisc/include/asm/scatterlist.h
index 2c3b79b54b28ba4899233970ef377002039912b9..8bf1f0dd1f15f584e037c45342f476d4ee2af2c5 100644
(file)
--- a/
arch/parisc/include/asm/scatterlist.h
+++ b/
arch/parisc/include/asm/scatterlist.h
@@
-5,7
+5,6
@@
#include <asm/types.h>
#include <asm-generic/scatterlist.h>
-#define ISA_DMA_THRESHOLD (~0UL)
#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))
#endif /* _ASM_PARISC_SCATTERLIST_H */