Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[firefly-linux-kernel-4.4.55.git] / include / linux / agp_backend.h

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 2b8df8b420fd0ebb2dc648d46d4aec3e148967f9..76fa794fdac0fdab91bfc74204c5642ec09384fb 100644 (file)
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -70,7 +70,7 @@ struct agp_memory {
        struct agp_memory *next;
        struct agp_memory *prev;
        struct agp_bridge_data *bridge;
-       unsigned long *memory;
+       struct page **pages;
        size_t page_count;
        int key;
        int num_scratch_pages;