diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:39:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:39:44 -0400 |
| commit | 9cf52b2921fbe62566b6b2ee79f71203749c9e5e (patch) | |
| tree | 5705ab0af0adfb7043407b5a4ffbf43fcbff42bd /include/linux | |
| parent | 952184304fbf030f0133d8b66a91b2847dce729e (diff) | |
| parent | 5c45708352a040f19caceb683c78bc86aad466f6 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC/64]: Consolidate of_register_driver
[SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex
[SPARC]: Support for new termios.
[SPARC64]: Check of_get_property() return in pci_determine_mem_io_space().
[SPARC64]: Fix boot failures due to bootmem.
[SPARC64]: Implement atomic backoff.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_platform.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 448f70b30a0c..a8efcfeea732 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h | |||
| @@ -48,6 +48,10 @@ struct of_platform_driver | |||
| 48 | #define to_of_platform_driver(drv) \ | 48 | #define to_of_platform_driver(drv) \ |
| 49 | container_of(drv,struct of_platform_driver, driver) | 49 | container_of(drv,struct of_platform_driver, driver) |
| 50 | 50 | ||
| 51 | extern int of_register_driver(struct of_platform_driver *drv, | ||
| 52 | struct bus_type *bus); | ||
| 53 | extern void of_unregister_driver(struct of_platform_driver *drv); | ||
| 54 | |||
| 51 | #include <asm/of_platform.h> | 55 | #include <asm/of_platform.h> |
| 52 | 56 | ||
| 53 | extern struct of_device *of_find_device_by_node(struct device_node *np); | 57 | extern struct of_device *of_find_device_by_node(struct device_node *np); |