diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-31 17:24:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-31 17:24:58 -0500 |
| commit | 9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a (patch) | |
| tree | b59b6610928accc3289f7d142319bb19342eee98 /include | |
| 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')
| -rw-r--r-- | include/asm-sparc/of_device.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/of_device.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/of_device.h b/include/asm-sparc/of_device.h index 80ea31f6e17f..7cb00c1b09c6 100644 --- a/include/asm-sparc/of_device.h +++ b/include/asm-sparc/of_device.h | |||
| @@ -33,7 +33,7 @@ struct of_device | |||
| 33 | #define to_of_device(d) container_of(d, struct of_device, dev) | 33 | #define to_of_device(d) container_of(d, struct of_device, dev) |
| 34 | 34 | ||
| 35 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); | 35 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); |
| 36 | extern void of_iounmap(void __iomem *base, unsigned long size); | 36 | extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); |
| 37 | 37 | ||
| 38 | extern struct of_device *of_find_device_by_node(struct device_node *); | 38 | extern struct of_device *of_find_device_by_node(struct device_node *); |
| 39 | 39 | ||
diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h index a62c7b997d66..60e9173c9acb 100644 --- a/include/asm-sparc64/of_device.h +++ b/include/asm-sparc64/of_device.h | |||
| @@ -34,7 +34,7 @@ struct of_device | |||
| 34 | #define to_of_device(d) container_of(d, struct of_device, dev) | 34 | #define to_of_device(d) container_of(d, struct of_device, dev) |
| 35 | 35 | ||
| 36 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); | 36 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); |
| 37 | extern void of_iounmap(void __iomem *base, unsigned long size); | 37 | extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); |
| 38 | 38 | ||
| 39 | extern struct of_device *of_find_device_by_node(struct device_node *); | 39 | extern struct of_device *of_find_device_by_node(struct device_node *); |
| 40 | 40 | ||