diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ioport.h | 4 | ||||
-rw-r--r-- | include/linux/pnp.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index c6801bffe76d..39db059ffb8b 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -88,6 +88,10 @@ struct resource_list { | |||
88 | #define IORESOURCE_MEM_SHADOWABLE (1<<5) /* dup: IORESOURCE_SHADOWABLE */ | 88 | #define IORESOURCE_MEM_SHADOWABLE (1<<5) /* dup: IORESOURCE_SHADOWABLE */ |
89 | #define IORESOURCE_MEM_EXPANSIONROM (1<<6) | 89 | #define IORESOURCE_MEM_EXPANSIONROM (1<<6) |
90 | 90 | ||
91 | /* PnP I/O specific bits (IORESOURCE_BITS) */ | ||
92 | #define IORESOURCE_IO_16BIT_ADDR (1<<0) | ||
93 | #define IORESOURCE_IO_FIXED (1<<1) | ||
94 | |||
91 | /* PCI ROM control bits (IORESOURCE_BITS) */ | 95 | /* PCI ROM control bits (IORESOURCE_BITS) */ |
92 | #define IORESOURCE_ROM_ENABLE (1<<0) /* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */ | 96 | #define IORESOURCE_ROM_ENABLE (1<<0) /* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */ |
93 | #define IORESOURCE_ROM_SHADOW (1<<1) /* ROM is copy at C000:0 */ | 97 | #define IORESOURCE_ROM_SHADOW (1<<1) /* ROM is copy at C000:0 */ |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index e033e1b14c27..e1454dabde10 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -182,9 +182,6 @@ static inline int pnp_dma_valid(struct pnp_dev *dev, unsigned int bar) | |||
182 | } | 182 | } |
183 | 183 | ||
184 | 184 | ||
185 | #define PNP_PORT_FLAG_16BITADDR (1<<0) | ||
186 | #define PNP_PORT_FLAG_FIXED (1<<1) | ||
187 | |||
188 | struct pnp_port { | 185 | struct pnp_port { |
189 | unsigned short min; /* min base number */ | 186 | unsigned short min; /* min base number */ |
190 | unsigned short max; /* max base number */ | 187 | unsigned short max; /* max base number */ |