diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-17 14:58:38 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-17 14:58:38 +0200 |
| commit | 90b94273e99f5f5289817bb1fc806f9c4991f2eb (patch) | |
| tree | d3002ab06484372fd68920f60b041834de24e10e /arch/frv | |
| parent | 05fc5d209cb070c621dbcbc20397eb4346dbaa86 (diff) | |
| parent | 8576d7da7f13c988da031fb75529b0a9b29f7f02 (diff) | |
Merge branch 'for-2.6.36' into for-next
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/include/asm/scatterlist.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h index 1614bfd7e3a4..0e5eb3018468 100644 --- a/arch/frv/include/asm/scatterlist.h +++ b/arch/frv/include/asm/scatterlist.h @@ -3,6 +3,4 @@ #include <asm-generic/scatterlist.h> -#define ISA_DMA_THRESHOLD (0xffffffffUL) - #endif /* !_ASM_SCATTERLIST_H */ |