diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 15:04:04 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 15:04:04 -0400 |
commit | 8040d77688014987ca5738bf1731db72ab273441 (patch) | |
tree | 99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /include/linux | |
parent | fb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff) | |
parent | 268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff) |
Merge branch 'core/resources' into x86/core
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ioport.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 8d3b7a9afd17..fded376b94e3 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -108,6 +108,9 @@ extern struct resource iomem_resource; | |||
108 | 108 | ||
109 | extern int request_resource(struct resource *root, struct resource *new); | 109 | extern int request_resource(struct resource *root, struct resource *new); |
110 | extern int release_resource(struct resource *new); | 110 | extern int release_resource(struct resource *new); |
111 | extern void reserve_region_with_split(struct resource *root, | ||
112 | resource_size_t start, resource_size_t end, | ||
113 | const char *name); | ||
111 | extern int insert_resource(struct resource *parent, struct resource *new); | 114 | extern int insert_resource(struct resource *parent, struct resource *new); |
112 | extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new); | 115 | extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new); |
113 | extern int allocate_resource(struct resource *root, struct resource *new, | 116 | extern int allocate_resource(struct resource *root, struct resource *new, |