Merge branch 'fixes' into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / ioport.h

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 589e0e75efae2dc1146da2cc0f92e6c649f834ed..85ac9b9b72a24acc54ebab8241d279fe2332d4b6 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -29,8 +29,9 @@ 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
 #define IORESOURCE_DMA         0x00000800
 #define IORESOURCE_BUS         0x00001000