From 96846c377105a987b763567e8807e784d6180836 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Fri, 30 Apr 2010 09:34:29 -0400
Subject: [PATCH] --- yaml --- r: 192575 b: refs/heads/master c:
 83897badcb20243465b67a5826dfdda50a052eb5 h: refs/heads/master i:   192573:
 de406e9b913429ab9d1a73a3b5d29e02e9b42c6f   192571:
 548cc98645993c4e3835f543b8ddf12142d5728d   192567:
 cae373a27a08e506ef46acbf69d73b7dc933b51d   192559:
 dd83c961ef60f69402ffb7282c21048b5849d751   192543:
 830569431beb0bfc00aa01d94d47cafcfd261f62   192511:
 9325e2bfdab79e49b7c0cb495169b590fb8ee8d3 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/agp/generic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 18472f5a8cd8..bcc760841f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 758ef749f3b1a4c5e6ba5b5bca5eae968a2c0c5f
+refs/heads/master: 83897badcb20243465b67a5826dfdda50a052eb5
diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
index fb86708e47ed..4b51982fd23a 100644
--- a/trunk/drivers/char/agp/generic.c
+++ b/trunk/drivers/char/agp/generic.c
@@ -1214,7 +1214,7 @@ struct agp_memory *agp_generic_alloc_user(size_t page_count, int type)
 		return NULL;
 
 	for (i = 0; i < page_count; i++)
-		new->pages[i] = 0;
+		new->pages[i] = NULL;
 	new->page_count = 0;
 	new->type = type;
 	new->num_scratch_pages = pages;