From f136e85a4200534dbe51aaf11ad27b9b21fe8762 Mon Sep 17 00:00:00 2001
From: aoyama <aoyama@openbsd.org>
Date: Fri, 19 Dec 2014 13:17:35 +0000
Subject: [PATCH] Move cbus.c, cbusvar.h, and pcex.c to new 'cbus' directory,
 to gather 'C-bus' device drivers in it.

More devices on cbus(4) will be added, hopefully :-)

ok miod@
---
 sys/arch/luna88k/{dev => cbus}/cbus.c    | 4 ++--
 sys/arch/luna88k/{dev => cbus}/cbusvar.h | 2 +-
 sys/arch/luna88k/{dev => cbus}/pcex.c    | 4 ++--
 sys/arch/luna88k/conf/files.luna88k      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename sys/arch/luna88k/{dev => cbus}/cbus.c (98%)
 rename sys/arch/luna88k/{dev => cbus}/cbusvar.h (95%)
 rename sys/arch/luna88k/{dev => cbus}/pcex.c (97%)

diff --git a/sys/arch/luna88k/dev/cbus.c b/sys/arch/luna88k/cbus/cbus.c
similarity index 98%
rename from sys/arch/luna88k/dev/cbus.c
rename to sys/arch/luna88k/cbus/cbus.c
index 1f92b8f0ca5..571296b137c 100644
--- a/sys/arch/luna88k/dev/cbus.c
+++ b/sys/arch/luna88k/cbus/cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbus.c,v 1.1 2014/12/08 13:24:04 aoyama Exp $	*/
+/*	$OpenBSD: cbus.c,v 1.1 2014/12/19 13:17:35 aoyama Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
@@ -29,7 +29,7 @@
 #include <machine/autoconf.h>
 #include <machine/board.h>	/* PC_BASE */
 
-#include <luna88k/dev/cbusvar.h>
+#include <luna88k/cbus/cbusvar.h>
 #include <luna88k/luna88k/isr.h>	/* isrlink_autovec() */
 
 #if 0
diff --git a/sys/arch/luna88k/dev/cbusvar.h b/sys/arch/luna88k/cbus/cbusvar.h
similarity index 95%
rename from sys/arch/luna88k/dev/cbusvar.h
rename to sys/arch/luna88k/cbus/cbusvar.h
index c73e8629223..547a2371c16 100644
--- a/sys/arch/luna88k/dev/cbusvar.h
+++ b/sys/arch/luna88k/cbus/cbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbusvar.h,v 1.1 2014/12/08 13:24:04 aoyama Exp $	*/
+/*	$OpenBSD: cbusvar.h,v 1.1 2014/12/19 13:17:35 aoyama Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
diff --git a/sys/arch/luna88k/dev/pcex.c b/sys/arch/luna88k/cbus/pcex.c
similarity index 97%
rename from sys/arch/luna88k/dev/pcex.c
rename to sys/arch/luna88k/cbus/pcex.c
index 82e8d19abac..d48962b1c48 100644
--- a/sys/arch/luna88k/dev/pcex.c
+++ b/sys/arch/luna88k/cbus/pcex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcex.c,v 1.4 2014/12/08 13:24:04 aoyama Exp $	*/
+/*	$OpenBSD: pcex.c,v 1.1 2014/12/19 13:17:35 aoyama Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
@@ -30,7 +30,7 @@
 #include <machine/conf.h>
 #include <machine/pcex.h>
 
-#include <luna88k/dev/cbusvar.h>
+#include <luna88k/cbus/cbusvar.h>
 
 extern int hz;
 
diff --git a/sys/arch/luna88k/conf/files.luna88k b/sys/arch/luna88k/conf/files.luna88k
index 69b87de8953..0acf5f35326 100644
--- a/sys/arch/luna88k/conf/files.luna88k
+++ b/sys/arch/luna88k/conf/files.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.luna88k,v 1.22 2014/12/08 13:24:04 aoyama Exp $
+#	$OpenBSD: files.luna88k,v 1.23 2014/12/19 13:17:35 aoyama Exp $
 #
 maxpartitions 16
 
@@ -67,11 +67,11 @@ file arch/luna88k/dev/mb89352.c				spc
 
 device cbus {}
 attach	cbus at mainbus
-file	arch/luna88k/dev/cbus.c
+file	arch/luna88k/cbus/cbus.c
 
 device pcex
 attach	pcex at cbus
-file	arch/luna88k/dev/pcex.c				pcex needs-flag
+file	arch/luna88k/cbus/pcex.c				pcex needs-flag
 
 # list of standard files
 file	arch/luna88k/luna88k/clock.c
-- 
2.20.1