diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-31 14:24:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-31 14:24:58 -0800 |
| commit | 9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a (patch) | |
| tree | b59b6610928accc3289f7d142319bb19342eee98 /include/asm-sparc64/of_device.h | |
| parent | b836267aa79c1c5e23e00d9cec047b6870ae0db1 (diff) | |
| parent | f4060c0dbbe9ad7b8c0aeefa142398c8d3468bac (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Handle ISA devices with no 'regs' property.
[SPARC64]: Update defconfig.
[SPARC64]: Fix of_iounmap() region release.
[SPARC64]: Fix "mem=xxx" handling.
Diffstat (limited to 'include/asm-sparc64/of_device.h')
| -rw-r--r-- | include/asm-sparc64/of_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h index a62c7b997d6..60e9173c9ac 100644 --- a/include/asm-sparc64/of_device.h +++ b/include/asm-sparc64/of_device.h @@ -34,7 +34,7 @@ struct of_device #define to_of_device(d) container_of(d, struct of_device, dev) extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); -extern void of_iounmap(void __iomem *base, unsigned long size); +extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); extern struct of_device *of_find_device_by_node(struct device_node *); |