diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 23:10:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 23:10:39 +0100 |
| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad (patch) | |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 /include/linux/ioport.h | |
| parent | 8127f4e883666c9960cfa89cffd36313748f8bab (diff) | |
| parent | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff) | |
| download | kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.gz kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.xz kernel-crypto-e1a0bdd8022317e98650e70850de73eccfcde5ad.zip | |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'include/linux/ioport.h')
| -rw-r--r-- | include/linux/ioport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 83aa81297ea..7129504e053 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -126,11 +126,11 @@ extern int allocate_resource(struct resource *root, struct resource *new, int adjust_resource(struct resource *res, resource_size_t start, resource_size_t size); resource_size_t resource_alignment(struct resource *res); -static inline resource_size_t resource_size(struct resource *res) +static inline resource_size_t resource_size(const struct resource *res) { return res->end - res->start + 1; } -static inline unsigned long resource_type(struct resource *res) +static inline unsigned long resource_type(const struct resource *res) { return res->flags & IORESOURCE_TYPE_BITS; } |