diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /arch/sparc/prom/tree_64.c | |
parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
download | linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sparc/prom/tree_64.c')
-rw-r--r-- | arch/sparc/prom/tree_64.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/sparc/prom/tree_64.c b/arch/sparc/prom/tree_64.c index 691be68932f8..d93660048376 100644 --- a/arch/sparc/prom/tree_64.c +++ b/arch/sparc/prom/tree_64.c @@ -374,24 +374,6 @@ inline phandle prom_inst2pkg(int inst) return node; } -/* Return 'node' assigned to a particular prom 'path' - * FIXME: Should work for v0 as well - */ -phandle prom_pathtoinode(const char *path) -{ - phandle node; - int inst; - - inst = prom_devopen (path); - if (inst == 0) - return 0; - node = prom_inst2pkg(inst); - prom_devclose(inst); - if (node == -1) - return 0; - return node; -} - int prom_ihandle2path(int handle, char *buffer, int bufsize) { unsigned long args[7]; |