diff options
| author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 14:40:55 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 14:40:55 -0500 |
| commit | 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c (patch) | |
| tree | da9759151e00221c58cdd9f4de893c0b08753670 /kernel/resource.c | |
| parent | 1ad53a98c927a9b5b1b57288ac0edec562fbcf8d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of /home/shaggy/git/linus-clean/
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index ca6a1536b205..fd5d7d574bb9 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -620,6 +620,7 @@ resource_size_t resource_alignment(struct resource *res) | |||
| 620 | * @start: resource start address | 620 | * @start: resource start address |
| 621 | * @n: resource region size | 621 | * @n: resource region size |
| 622 | * @name: reserving caller's ID string | 622 | * @name: reserving caller's ID string |
| 623 | * @flags: IO resource flags | ||
| 623 | */ | 624 | */ |
| 624 | struct resource * __request_region(struct resource *parent, | 625 | struct resource * __request_region(struct resource *parent, |
| 625 | resource_size_t start, resource_size_t n, | 626 | resource_size_t start, resource_size_t n, |