From 6b17022283b63f2bb6e8226c2e4fc30b2ad726ed Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 7 Aug 2012 19:42:46 +0100
Subject: [PATCH] --- yaml --- r: 329937 b: refs/heads/master c:
 c04a9cb813f124abcfad50f93b101ceaee8f3b9f h: refs/heads/master i:   329935:
 a8f1797d182f31a3a5864d6ed88c48ebf36a39f0 v: v3

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

diff --git a/[refs] b/[refs]
index b02ec9a48031..1e6593aff825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72dcb1197228b50bfb709ba97c2d53013c605868
+refs/heads/master: c04a9cb813f124abcfad50f93b101ceaee8f3b9f
diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h
index bfee885791c2..85ac9b9b72a2 100644
--- a/trunk/include/linux/ioport.h
+++ b/trunk/include/linux/ioport.h
@@ -29,7 +29,7 @@ struct resource {
 #define IORESOURCE_BITS		0x000000ff	/* Bus-specific bits */
 
 #define IORESOURCE_TYPE_BITS	0x00001f00	/* Resource type */
-#define IORESOURCE_IO		0x00000100
+#define IORESOURCE_IO		0x00000100	/* PCI/ISA I/O ports */
 #define IORESOURCE_MEM		0x00000200
 #define IORESOURCE_REG		0x00000300	/* Register offsets */
 #define IORESOURCE_IRQ		0x00000400