From 2bad7407f929f7ad3da03d388d221232cd18ec0e Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 2 Apr 2009 23:23:43 +0100
Subject: [PATCH] --- yaml --- r: 139897 b: refs/heads/master c:
 67a52bb90b515c2a96ec51a3571bcd70a2fadb50 h: refs/heads/master i:   139895:
 35d722b0977f5990c0e313ab89ed20dea963cc2e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/mtd/maps/pxa2xx-flash.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89317e4a519c..ad8c05cf9dab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd02938a828f4b2098a074afb7454f106f2e8df5
+refs/heads/master: 67a52bb90b515c2a96ec51a3571bcd70a2fadb50
diff --git a/trunk/drivers/mtd/maps/pxa2xx-flash.c b/trunk/drivers/mtd/maps/pxa2xx-flash.c
index e9026cb1c5b2..572d32fdf38a 100644
--- a/trunk/drivers/mtd/maps/pxa2xx-flash.c
+++ b/trunk/drivers/mtd/maps/pxa2xx-flash.c
@@ -117,7 +117,7 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit pxa2xx_flash_remove(struct platform_device *dev)
+static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
 {
 	struct pxa2xx_flash_info *info = platform_get_drvdata(dev);