aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2010-03-05 10:47:26 -0700
committerLen Brown <len.brown@intel.com>2010-03-14 20:08:34 -0400
commitcd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6 (patch)
treea754bc15350dced59165d6de3a38d32b1fd6a43e
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadkernel_samsung_crespo-cd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6.zip
kernel_samsung_crespo-cd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6.tar.gz
kernel_samsung_crespo-cd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6.tar.bz2
resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type
No functional change; this just makes room for another resource type. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--include/linux/ioport.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index dda9841..b126209 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -34,20 +34,20 @@ struct resource_list {
*/
#define IORESOURCE_BITS 0x000000ff /* Bus-specific bits */
-#define IORESOURCE_TYPE_BITS 0x00000f00 /* Resource type */
+#define IORESOURCE_TYPE_BITS 0x00001f00 /* Resource type */
#define IORESOURCE_IO 0x00000100
#define IORESOURCE_MEM 0x00000200
#define IORESOURCE_IRQ 0x00000400
#define IORESOURCE_DMA 0x00000800
-#define IORESOURCE_PREFETCH 0x00001000 /* No side effects */
-#define IORESOURCE_READONLY 0x00002000
-#define IORESOURCE_CACHEABLE 0x00004000
-#define IORESOURCE_RANGELENGTH 0x00008000
-#define IORESOURCE_SHADOWABLE 0x00010000
+#define IORESOURCE_PREFETCH 0x00002000 /* No side effects */
+#define IORESOURCE_READONLY 0x00004000
+#define IORESOURCE_CACHEABLE 0x00008000
+#define IORESOURCE_RANGELENGTH 0x00010000
+#define IORESOURCE_SHADOWABLE 0x00020000
-#define IORESOURCE_SIZEALIGN 0x00020000 /* size indicates alignment */
-#define IORESOURCE_STARTALIGN 0x00040000 /* start field is alignment */
+#define IORESOURCE_SIZEALIGN 0x00040000 /* size indicates alignment */
+#define IORESOURCE_STARTALIGN 0x00080000 /* start field is alignment */
#define IORESOURCE_MEM_64 0x00100000