diff --git a/[refs] b/[refs] index 07f903f3513d..b02ec9a48031 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c10c2aab634a3c61c46b98875988b2f53040bc9c +refs/heads/master: 72dcb1197228b50bfb709ba97c2d53013c605868 diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h index 589e0e75efae..bfee885791c2 100644 --- a/trunk/include/linux/ioport.h +++ b/trunk/include/linux/ioport.h @@ -31,6 +31,7 @@ struct resource { #define IORESOURCE_TYPE_BITS 0x00001f00 /* Resource type */ #define IORESOURCE_IO 0x00000100 #define IORESOURCE_MEM 0x00000200 +#define IORESOURCE_REG 0x00000300 /* Register offsets */ #define IORESOURCE_IRQ 0x00000400 #define IORESOURCE_DMA 0x00000800 #define IORESOURCE_BUS 0x00001000