Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / of.c

diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index 6108aef28f0387d6cd3fbf68e74fb26c80960fc3..61d9899aa0d09d371c99ec70b7959693f8bfab36 100644 (file)
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -17,8 +17,6 @@
 
 #include "of.h"
 
-extern char _end[];
-
 /* Value picked to match that used by yaboot */
 #define PROG_START     0x01400000      /* only used on 64-bit systems */
 #define RAM_END                (512<<20)       /* Fixme: use OF */
@@ -63,36 +61,6 @@ static void of_image_hdr(const void *hdr)
        }
 }
 
-static void *of_vmlinux_alloc(unsigned long size)
-{
-       void *p = malloc(size);
-
-       if (!p)
-               fatal("Can't allocate memory for kernel image!\n\r");
-
-       return p;
-}
-
-/*
- * OF device tree routines
- */
-static void *of_finddevice(const char *name)
-{
-       return (phandle) of_call_prom("finddevice", 1, 1, name);
-}
-
-static int of_getprop(const void *phandle, const char *name, void *buf,
-               const int buflen)
-{
-       return of_call_prom("getprop", 4, 1, phandle, name, buf, buflen);
-}
-
-static int of_setprop(const void *phandle, const char *name, const void *buf,
-               const int buflen)
-{
-       return of_call_prom("setprop", 4, 1, phandle, name, buf, buflen);
-}
-
 void platform_init(unsigned long a1, unsigned long a2, void *promptr)
 {
        platform_ops.image_hdr = of_image_hdr;