Index: arch/ppc32/src/drivers/ofw.c
===================================================================
--- arch/ppc32/src/drivers/ofw.c	(revision 4b2c872d993209cc50bfe660125b5f9537183b14)
+++ 	(revision )
@@ -1,104 +1,0 @@
-/*
- * Copyright (C) 2005 Martin Decky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arch/drivers/ofw.h>
-#include <arch/asm.h>
-#include <stdarg.h>
-#include <cpu.h>
-
-ofw_entry ofw;
-
-phandle ofw_chosen;
-ihandle ofw_stdout;
-
-void ofw_init(void)
-{
-	ofw_chosen = ofw_find_device("/chosen");
-	if (ofw_chosen == -1)
-		ofw_done();
-	
-	if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)
-		ofw_stdout = 0;
-}
-
-void ofw_done(void)
-{
-	ofw_call("exit", 0, 0);
-	cpu_halt();
-}
-
-int ofw_call(const char *service, const int nargs, const int nret, ...)
-{
-	va_list list;
-	ofw_args_t args;
-	int i;
-	
-	args.service = service;
-	args.nargs = nargs;
-	args.nret = nret;
-	
-	va_start(list, nret);
-	for (i = 0; i < nargs; i++)
-		args.args[i] = va_arg(list, ofw_arg_t);
-	va_end(list);
-	
-	for (i = 0; i < nret; i++)
-		args.args[i + nargs] = 0;
-	
-	ofw(&args);
-	
-	return args.args[nargs];
-}
-
-void ofw_putchar(const char ch)
-{
-	if (ofw_stdout == 0)
-		return;
-	
-	ofw_call("write", 3, 1, ofw_stdout, &ch, 1);
-}
-
-phandle ofw_find_device(const char *name)
-{
-	return ofw_call("finddevice", 1, 1, name);
-}
-
-int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
-{
-	return ofw_call("getprop", 4, 1, device, name, buf, buflen);
-}
-
-void *ofw_claim(const void *addr, const int size, const int align)
-{
-	return (void *) ofw_call("claim", 3, 1, addr, size, align);
-}
-
-void putchar(const char ch)
-{
-	ofw_putchar(ch);
-}
Index: arch/ppc32/src/mm/memory_init.c
===================================================================
--- arch/ppc32/src/mm/memory_init.c	(revision 4b2c872d993209cc50bfe660125b5f9537183b14)
+++ arch/ppc32/src/mm/memory_init.c	(revision b9b103d37b95962be0d0b96fa9f55fb8cceaca2a)
@@ -28,5 +28,5 @@
 
 #include <arch/mm/memory_init.h>
-#include <arch/drivers/ofw.h>
+#include <genarch/firmware/ofw/ofw.h>
 #include <panic.h>