diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
| commit | 6552ebae25ffd57574c6e72d17fce67fea08b918 (patch) | |
| tree | cde6cc932c7e47d818154b011dfd8a6997d5c18e /kernel/resource.c | |
| parent | 749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff) | |
| parent | 336f6c322d87806ef93afad6308ac65083a865e5 (diff) | |
Merge branch 'core/debugobjects' into core/urgent
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, |