kernel/resource: move and rename IORESOURCE_MEM_DRIVER_MANAGED

[linux-2.6-microblaze.git] / include / linux / ioport.h

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 6c2b06f..d7620d7 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -58,6 +58,9 @@ struct resource {
 #define IORESOURCE_EXT_TYPE_BITS 0x01000000    /* Resource extended types */
 #define IORESOURCE_SYSRAM      0x01000000      /* System RAM (modifier) */
 
+/* IORESOURCE_SYSRAM specific bits. */
+#define IORESOURCE_SYSRAM_DRIVER_MANAGED       0x02000000 /* Always detected via a driver. */
+
 #define IORESOURCE_EXCLUSIVE   0x08000000      /* Userland may not map this resource */
 
 #define IORESOURCE_DISABLED    0x10000000
@@ -103,7 +106,6 @@ struct resource {
 #define IORESOURCE_MEM_32BIT           (3<<3)
 #define IORESOURCE_MEM_SHADOWABLE      (1<<5)  /* dup: IORESOURCE_SHADOWABLE */
 #define IORESOURCE_MEM_EXPANSIONROM    (1<<6)
-#define IORESOURCE_MEM_DRIVER_MANAGED  (1<<7)
 
 /* PnP I/O specific bits (IORESOURCE_BITS) */
 #define IORESOURCE_IO_16BIT_ADDR       (1<<0)
@@ -248,8 +250,8 @@ extern struct resource * __request_region(struct resource *,
 extern void __release_region(struct resource *, resource_size_t,
                                resource_size_t);
 #ifdef CONFIG_MEMORY_HOTREMOVE
-extern int release_mem_region_adjustable(struct resource *, resource_size_t,
-                               resource_size_t);
+extern void release_mem_region_adjustable(struct resource *, resource_size_t,
+                                         resource_size_t);
 #endif
 
 /* Wrappers for managed devices */