diff options
| author | Linus Torvalds | 2007-07-20 18:18:08 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-07-20 18:18:08 +0200 |
| commit | 2cb7e714229681408e323852bed939989faf6991 (patch) | |
| tree | 552b78fa5830a0337594f9fbab5f1dc0306e93cd /arch/sparc64/kernel/auxio.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | Create drivers/of/platform.c (diff) | |
| download | kernel-qcow2-linux-2cb7e714229681408e323852bed939989faf6991.tar.gz kernel-qcow2-linux-2cb7e714229681408e323852bed939989faf6991.tar.xz kernel-qcow2-linux-2cb7e714229681408e323852bed939989faf6991.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons:
Create drivers/of/platform.c
Create linux/of_platorm.h
[SPARC/64] Rename some functions like PowerPC
Begin consolidation of of_device.h
Begin to consolidate of_device.c
Consolidate of_find_node_by routines
Consolidate of_get_next_child
Consolidate of_get_parent
Consolidate of_find_property
Consolidate of_device_is_compatible
Start split out of common open firmware code
Split out common parts of prom.h
Diffstat (limited to 'arch/sparc64/kernel/auxio.c')
| -rw-r--r-- | arch/sparc64/kernel/auxio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c index 826118ee53d5..7b379761e9f8 100644 --- a/arch/sparc64/kernel/auxio.c +++ b/arch/sparc64/kernel/auxio.c @@ -155,7 +155,7 @@ static struct of_platform_driver auxio_driver = { static int __init auxio_init(void) { - return of_register_driver(&auxio_driver, &of_bus_type); + return of_register_driver(&auxio_driver, &of_platform_bus_type); } /* Must be after subsys_initcall() so that busses are probed. Must |