diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 02:28:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 02:28:26 -0500 |
commit | bfc1de0c40a26c6daa46c297e28138aecb4c5664 (patch) | |
tree | 5ac390e4c790076fda0644dd8b583ca819051905 /arch/sparc/kernel/of_device.c | |
parent | 1712a699ab32d4952fe6b0f97af91b8230bece98 (diff) | |
parent | e88bb41595ad67a8e7d5dd8c7bbeea2e66cc0cac (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (24 commits)
[SPARC]: Add solaris/sunos binary support to feature removal schedule.
[SPARC]: Merge asm-sparc{,64}/a.out.h
[SPARC]: Merge asm-sparc{,64}/fb.h
[SPARC]: Merge asm-sparc{,64}/errno.h
[SPARC]: Merge asm-sparc{,64}/emergency-restart.h
[SPARC]: Merge asm-sparc{,64}/div64.h
[SPARC]: Merge asm-sparc{,64}/device.h
[SPARC]: Merge asm-sparc{,64}/current.h
[SPARC]: Merge asm-sparc{,64}/cputime.h
[SPARC]: Merge asm-sparc{,64}/cache.h
[SPARC]: Merge asm-sparc{,64}/byteorder.h
[SPARC]: Merge asm-sparc{,64}/bugs.h
[SPARC]: Merge asm-sparc{,64}/bug.h
[SPARC]: Kill BSD errno translation table and header files.
[SPARC]: Merge asm-sparc{,64}/bpp.h
[SPARC]: Merge include/asm-sparc{,64}/auxvec.h
[SPARC]: Merge include/asm-sparc{,64}/of_device.h
[SPARC]: Merge include/asm-sparc{,64}/prom.h
[SPARC]: Remove of_platform_device_create
[SPARC64]: Add kretprobe support.
...
Diffstat (limited to 'arch/sparc/kernel/of_device.c')
-rw-r--r-- | arch/sparc/kernel/of_device.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 3ea000d15e3a..cc4c235c4f59 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
@@ -584,30 +584,3 @@ static int __init of_debug(char *str) | |||
584 | } | 584 | } |
585 | 585 | ||
586 | __setup("of_debug=", of_debug); | 586 | __setup("of_debug=", of_debug); |
587 | |||
588 | struct of_device* of_platform_device_create(struct device_node *np, | ||
589 | const char *bus_id, | ||
590 | struct device *parent, | ||
591 | struct bus_type *bus) | ||
592 | { | ||
593 | struct of_device *dev; | ||
594 | |||
595 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | ||
596 | if (!dev) | ||
597 | return NULL; | ||
598 | |||
599 | dev->dev.parent = parent; | ||
600 | dev->dev.bus = bus; | ||
601 | dev->dev.release = of_release_dev; | ||
602 | |||
603 | strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); | ||
604 | |||
605 | if (of_device_register(dev) != 0) { | ||
606 | kfree(dev); | ||
607 | return NULL; | ||
608 | } | ||
609 | |||
610 | return dev; | ||
611 | } | ||
612 | |||
613 | EXPORT_SYMBOL(of_platform_device_create); | ||