From 629343f8896869d5a466f3a45d9589011f94a3f3 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Tue, 23 Mar 2010 16:05:00 +0100
Subject: [PATCH] --- yaml --- r: 189103 b: refs/heads/master c:
 9713ab28ec92d0c44b2ac5765dfc26c619d9cadd h: refs/heads/master i:   189101:
 f9d558e9cfb3ff50f322c7fb4d2ce0251cc1174b   189099:
 d6f8776d73b113b9bc106333e5a0245f72c4eaa0   189095:
 f47c92be771b2c75a699e2b8c1a791ab27d56802   189087:
 d32a58d4f9a87283b386a8ecf82909c4a6cdf252 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/pcmcia/rsrc_nonstatic.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26df2ba221e4..251ee12eccc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cbb2b941d2cc77e6b915e8e55d375be632c9f6a
+refs/heads/master: 9713ab28ec92d0c44b2ac5765dfc26c619d9cadd
diff --git a/trunk/drivers/pcmcia/rsrc_nonstatic.c b/trunk/drivers/pcmcia/rsrc_nonstatic.c
index 4663b3fa9f96..dcc602134d90 100644
--- a/trunk/drivers/pcmcia/rsrc_nonstatic.c
+++ b/trunk/drivers/pcmcia/rsrc_nonstatic.c
@@ -810,6 +810,13 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
 	unsigned long size = end - start + 1;
 	int ret = 0;
 
+#if defined(CONFIG_X86)
+	/* on x86, avoid anything < 0x100 for it is often used for
+	 * legacy platform devices */
+	if (start < 0x100)
+		start = 0x100;
+#endif
+
 	if (end < start)
 		return -EINVAL;