Merge branch 'next' into for-linus

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 2b8df8b420fd..76fa794fdac0 100644
--- 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;