From 89f89694d90fd3e5cbeba07c5b638163f2f4a139 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 12 Jun 2006 15:49:31 -0700
Subject: [PATCH] --- yaml --- r: 31096 b: refs/heads/master c:
 cf7c712c11fb881842534efe98a07f36f1c86c65 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ioport.h | 4 +++-
 trunk/include/linux/types.h  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d29d3af274ef..227de09812a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e29419fffceb8ec36def3c922040e1ca7bcd3de5
+refs/heads/master: cf7c712c11fb881842534efe98a07f36f1c86c65
diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h
index cd6bd001ba4e..535bd9585897 100644
--- a/trunk/include/linux/ioport.h
+++ b/trunk/include/linux/ioport.h
@@ -9,13 +9,15 @@
 #define _LINUX_IOPORT_H
 
 #include <linux/compiler.h>
+#include <linux/types.h>
 /*
  * Resources are tree-like, allowing
  * nesting etc..
  */
 struct resource {
+	resource_size_t start;
+	resource_size_t end;
 	const char *name;
-	unsigned long start, end;
 	unsigned long flags;
 	struct resource *parent, *sibling, *child;
 };
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index a5e46e783ffa..a021e1577336 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -177,6 +177,8 @@ typedef __u64 __bitwise __be64;
 
 #ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
+
+typedef unsigned long resource_size_t;
 #endif
 
 struct ustat {