From eff758219b3edc1829eda7c1b6c465b9552911e4 Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 9 Jan 2012 16:58:25 -0500
Subject: [PATCH] --- yaml --- r: 298075 b: refs/heads/master c:
 2ff5e1532dd37e1bd8ac72da3f7f0e2b310102fb h: refs/heads/master i:   298073:
 e2bbd94028e2330139a57d0845646bff2d8d2555   298071:
 5082b9c3a9bf88da4a8ee1c06efd3ef1bc302c6b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/devices/pmc551.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6c19a768d2cd..55768a8513ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ec5a2cb17d78482de0cf9e38721410d48c086d
+refs/heads/master: 2ff5e1532dd37e1bd8ac72da3f7f0e2b310102fb
diff --git a/trunk/drivers/mtd/devices/pmc551.c b/trunk/drivers/mtd/devices/pmc551.c
index ecff765579dd..cfccf6510411 100644
--- a/trunk/drivers/mtd/devices/pmc551.c
+++ b/trunk/drivers/mtd/devices/pmc551.c
@@ -359,7 +359,7 @@ static int pmc551_write(struct mtd_info *mtd, loff_t to, size_t len,
  * mechanism
  * returns the size of the memory region found.
  */
-static u32 fixup_pmc551(struct pci_dev *dev)
+static int fixup_pmc551(struct pci_dev *dev)
 {
 #ifdef CONFIG_MTD_PMC551_BUGFIX
 	u32 dram_data;
@@ -669,7 +669,7 @@ static int __init init_pmc551(void)
 	struct mypriv *priv;
 	int found = 0;
 	struct mtd_info *mtd;
-	u32 length = 0;
+	int length = 0;
 
 	if (msize) {
 		msize = (1 << (ffs(msize) - 1)) << 20;