diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:15:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:15:07 -0700 |
| commit | 5941de8eadc287f3f47b87ce9888734ee07d210b (patch) | |
| tree | 2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb /include/asm-s390/scatterlist.h | |
| parent | c44df7413fd711bca818111b94cbd7ce5f3600a9 (diff) | |
| parent | c6557e7f2b6ae76a44653d38f835174074c42e05 (diff) | |
| download | op-kernel-dev-5941de8eadc287f3f47b87ce9888734ee07d210b.zip op-kernel-dev-5941de8eadc287f3f47b87ce9888734ee07d210b.tar.gz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] move include/asm-s390 to arch/s390/include/asm
Diffstat (limited to 'include/asm-s390/scatterlist.h')
| -rw-r--r-- | include/asm-s390/scatterlist.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/asm-s390/scatterlist.h b/include/asm-s390/scatterlist.h deleted file mode 100644 index 29ec8e2..0000000 --- a/include/asm-s390/scatterlist.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _ASMS390_SCATTERLIST_H -#define _ASMS390_SCATTERLIST_H - -struct scatterlist { -#ifdef CONFIG_DEBUG_SG - unsigned long sg_magic; -#endif - unsigned long page_link; - unsigned int offset; - unsigned int length; -}; - -#ifdef __s390x__ -#define ISA_DMA_THRESHOLD (0xffffffffffffffffUL) -#else -#define ISA_DMA_THRESHOLD (0xffffffffUL) -#endif - -#endif /* _ASMS390X_SCATTERLIST_H */ |
