summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@bohr.(none)>2004-02-05 11:29:41 -0800
committerJames Simmons <jsimmons@bohr.(none)>2004-02-05 11:29:41 -0800
commit9ca5ce6c52c0de4812cd6631d9a85d4782226d45 (patch)
treeaf7ba9491d76059b6c782c8ec6fee14d0c7e3d78 /include/linux
parent13ffe14293ec2c45c11ebc3ed0281724d0d22287 (diff)
parentd925eab60387b18a46b036d8812c0b2166a70332 (diff)
Merge bk://fbdev.bkbits.net/fbdev-2.6
into bohr.(none):/usr/src/fbdev-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ioport.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 5ad913d3cd96..363aef7268c6 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -99,6 +99,8 @@ extern int allocate_resource(struct resource *root, struct resource *new,
void (*alignf)(void *, struct resource *,
unsigned long, unsigned long),
void *alignf_data);
+int adjust_resource(struct resource *res, unsigned long start,
+ unsigned long size);
/* Convenience shorthand with allocation */
#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name))