diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 20:08:13 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 20:08:13 +0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /arch/x86/include/asm/scatterlist.h | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
| download | linux-f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b.tar.xz | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/x86/include/asm/scatterlist.h')
| -rw-r--r-- | arch/x86/include/asm/scatterlist.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/scatterlist.h b/arch/x86/include/asm/scatterlist.h index 75af592677ec..fb0b1874396f 100644 --- a/arch/x86/include/asm/scatterlist.h +++ b/arch/x86/include/asm/scatterlist.h @@ -1,8 +1,9 @@ #ifndef _ASM_X86_SCATTERLIST_H #define _ASM_X86_SCATTERLIST_H -#define ISA_DMA_THRESHOLD (0x00ffffff) - #include <asm-generic/scatterlist.h> +#define ISA_DMA_THRESHOLD (0x00ffffff) +#define ARCH_HAS_SG_CHAIN + #endif /* _ASM_X86_SCATTERLIST_H */ |