diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:54:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 21:01:40 +0100 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /include/linux/agp_backend.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | op-kernel-dev-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.zip op-kernel-dev-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.gz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/linux/agp_backend.h')
| -rw-r--r-- | include/linux/agp_backend.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 76fa794..880130f 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -79,9 +79,12 @@ struct agp_memory { u32 physical; bool is_bound; bool is_flushed; - bool vmalloc_flag; + bool vmalloc_flag; /* list of agp_memory mapped to the aperture */ struct list_head mapped_list; + /* DMA-mapped addresses */ + struct scatterlist *sg_list; + int num_sg; }; #define AGP_NORMAL_MEMORY 0 |
