From 296244dfa54dcd70e62b61345177c951ed66ec4a Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 9 Aug 2009 11:42:32 +0200
Subject: [PATCH] --- yaml --- r: 169087 b: refs/heads/master c:
 0fdd07f77fd9cc6a7d49076793daef06ea5d8f13 h: refs/heads/master i:   169085:
 073c3856e0dba557a6443a94cec0f446b39eb1a1   169083:
 8bb32b7635187056e42c454a34f3e14879124849   169079:
 ad8d255e3d1c1c6d9fedb3e8f136aef4aa1e42fe   169071:
 e4c983657ba142416557def90a678880bd15ca63   169055:
 c1d021b2ed7d4087c2b75ae8f91afd97a1c85648   169023:
 8ce2a5f767e95c3d5560a83c8dac61fbd8c17674   168959:
 490e891e24e0a04b0510893c3d96d1cea2de7e1b v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/gbefb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f5685498d622..2c26b3dcf7ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf763a2f1c117cfe45bbbd2c874a150f0e0900b
+refs/heads/master: 0fdd07f77fd9cc6a7d49076793daef06ea5d8f13
diff --git a/trunk/drivers/video/gbefb.c b/trunk/drivers/video/gbefb.c
index 1a83709f9611..f67db4268374 100644
--- a/trunk/drivers/video/gbefb.c
+++ b/trunk/drivers/video/gbefb.c
@@ -1147,7 +1147,7 @@ static int __init gbefb_probe(struct platform_device *p_dev)
 	gbefb_setup(options);
 #endif
 
-	if (!request_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) {
+	if (!request_mem_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) {
 		printk(KERN_ERR "gbefb: couldn't reserve mmio region\n");
 		ret = -EBUSY;
 		goto out_release_framebuffer;