diff options
| -rw-r--r-- | sys/arch/socppc/conf/files.socppc | 4 | ||||
| -rw-r--r-- | sys/arch/socppc/socppc/machdep.c | 5 | ||||
| -rw-r--r-- | sys/dev/ofw/fdt.c (renamed from sys/arch/socppc/socppc/fdt.c) | 5 | ||||
| -rw-r--r-- | sys/dev/ofw/fdt.h (renamed from sys/arch/socppc/include/fdt.h) | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/socppc/conf/files.socppc b/sys/arch/socppc/conf/files.socppc index d1fab5ea752..745c5b006d5 100644 --- a/sys/arch/socppc/conf/files.socppc +++ b/sys/arch/socppc/conf/files.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.socppc,v 1.14 2016/01/08 15:54:13 jcs Exp $ +# $OpenBSD: files.socppc,v 1.15 2016/03/03 02:42:16 bmercer Exp $ # # macppc-specific configuration info @@ -15,7 +15,7 @@ file arch/socppc/socppc/machdep.c file arch/socppc/socppc/mem.c file dev/cninit.c file arch/socppc/socppc/db_interface.c ddb -file arch/socppc/socppc/fdt.c +file dev/ofw/fdt.c file arch/socppc/socppc/n1200_dts.S diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c index ffcf331b9dc..bfed97cc704 100644 --- a/sys/arch/socppc/socppc/machdep.c +++ b/sys/arch/socppc/socppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.64 2015/03/31 16:00:38 mpi Exp $ */ +/* $OpenBSD: machdep.c,v 1.65 2016/03/03 02:42:16 bmercer Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -52,7 +52,6 @@ #include <uvm/uvm_extern.h> #include <machine/bus.h> -#include <machine/fdt.h> #include <machine/pio.h> #include <powerpc/powerpc.h> #include <machine/trap.h> @@ -61,6 +60,8 @@ #include <dev/ic/comvar.h> +#include <dev/ofw/fdt.h> + #ifdef DDB #include <machine/db_machdep.h> #include <ddb/db_extern.h> diff --git a/sys/arch/socppc/socppc/fdt.c b/sys/dev/ofw/fdt.c index 0dec4fb3b38..cdbecee45fc 100644 --- a/sys/arch/socppc/socppc/fdt.c +++ b/sys/dev/ofw/fdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdt.c,v 1.12 2016/02/28 12:39:40 mpi Exp $ */ +/* $OpenBSD: fdt.c,v 1.1 2016/03/03 02:42:16 bmercer Exp $ */ /* * Copyright (c) 2009 Dariusz Swiderski <sfires@sfires.net> @@ -22,8 +22,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <machine/fdt.h> - +#include <dev/ofw/fdt.h> #include <dev/ofw/openfirm.h> unsigned int fdt_check_head(void *); diff --git a/sys/arch/socppc/include/fdt.h b/sys/dev/ofw/fdt.h index 849f6b2a2eb..6a2123962fb 100644 --- a/sys/arch/socppc/include/fdt.h +++ b/sys/dev/ofw/fdt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fdt.h,v 1.3 2009/10/01 20:21:05 dms Exp $ */ +/* $OpenBSD: fdt.h,v 1.1 2016/03/03 02:42:16 bmercer Exp $ */ /* * Copyright (c) 2009 Dariusz Swiderski <sfires@sfires.net> |