Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[~andy/linux] / include / asm-arm / scatterlist.h

diff --git a/include/asm-arm/scatterlist.h b/include/asm-arm/scatterlist.h
index 83b876fb04cc2c0074bed7d43b8c9f4e69173a96..de2f65eb42ed7cad529e8369c3dce85e505f2127 100644 (file)
--- a/include/asm-arm/scatterlist.h
+++ b/include/asm-arm/scatterlist.h
@@ -9,7 +9,6 @@ struct scatterlist {
        unsigned int    offset;         /* buffer offset                 */
        dma_addr_t      dma_address;    /* dma address                   */
        unsigned int    length;         /* length                        */
-       char            *__address;     /* for set_dma_addr              */
 };
 
 /*