Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[safe/jmp/linux-2.6] / include / linux / agp_backend.h

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 8a294d6..9101ed6 100644 (file)
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -53,7 +53,7 @@ struct agp_kern_info {
        int current_memory;
        bool cant_use_aperture;
        unsigned long page_mask;
-       struct vm_operations_struct *vm_ops;
+       const struct vm_operations_struct *vm_ops;
 };
 
 /*
@@ -80,7 +80,6 @@ struct agp_memory {
        bool is_bound;
        bool is_flushed;
        bool vmalloc_flag;
-       bool sg_vmalloc_flag;
        /* list of agp_memory mapped to the aperture */
        struct list_head mapped_list;
        /* DMA-mapped addresses */