From c1e392817634b34a5d92d1f1bd30c082352ce022 Mon Sep 17 00:00:00 2001
From: Stefan Roese <ml@stefan-roese.de>
Date: Fri, 19 Jan 2007 08:40:04 +0100
Subject: [PATCH] --- yaml --- r: 49147 b: refs/heads/master c:
 0d36da3b409536a24266c5f0972f2e1cfae1afd4 h: refs/heads/master i:   49145:
 2bc1caa9d69f1ad0fd356e6b10fa0d8196649fa0   49143:
 0f96f405188648119274383a7a530c8ea8f4cefc v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/mtd/map.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 355bfdaf2042..959ac6db31e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad7d314480d357db0466bef843cdc1abd9441d4f
+refs/heads/master: 0d36da3b409536a24266c5f0972f2e1cfae1afd4
diff --git a/trunk/include/linux/mtd/map.h b/trunk/include/linux/mtd/map.h
index 28d461d862bd..81f3a314dd76 100644
--- a/trunk/include/linux/mtd/map.h
+++ b/trunk/include/linux/mtd/map.h
@@ -183,7 +183,7 @@ typedef union {
 struct map_info {
 	char *name;
 	unsigned long size;
-	unsigned long phys;
+	resource_size_t phys;
 #define NO_XIP (-1UL)
 
 	void __iomem *virt;