Move acpi_toshiba.c, it's not pc32 specific.
authorHasso Tepper <hasso@dragonflybsd.org>
Thu, 28 Aug 2008 06:16:32 +0000 (06:16 +0000)
committerHasso Tepper <hasso@dragonflybsd.org>
Thu, 28 Aug 2008 06:16:32 +0000 (06:16 +0000)
sys/conf/files
sys/dev/acpica5/acpi_toshiba/Makefile
sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c [moved from sys/platform/pc32/acpica5/acpi_toshiba.c with 99% similarity]
sys/platform/pc32/conf/files

index d5c4f3c..9badfd2 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $
-# $DragonFly: src/sys/conf/files,v 1.230 2008/08/27 16:35:19 hasso Exp $
+# $DragonFly: src/sys/conf/files,v 1.231 2008/08/28 06:16:32 hasso Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1562,6 +1562,8 @@ ${OSACPI_MI_DIR}/Osd/OsdStream.c  optional acpi
 ${OSACPI_MI_DIR}/Osd/OsdSynch.c                optional acpi
 ${OSACPI_MI_DIR}/Osd/OsdTable.c                optional acpi
 
+${OSACPI_MI_DIR}/acpi_toshiba/acpi_toshiba.c   optional acpi_toshiba acpi
+
 # ACPICA code
 ${ACPICA_DIR}/debugger/dbcmds.c                        optional acpi acpi_debug
 ${ACPICA_DIR}/debugger/dbdisply.c              optional acpi acpi_debug
index a0be534..35c87ce 100644 (file)
@@ -1,11 +1,8 @@
 # $FreeBSD: src/sys/modules/acpi/acpi_toshiba/Makefile,v 1.1 2004/01/11 19:18:38 njl Exp $
-# $DragonFly: src/sys/dev/acpica5/acpi_toshiba/Makefile,v 1.3 2006/06/14 15:50:09 y0netan1 Exp $
-
-SYSDIR?=${.CURDIR}/../../..
+# $DragonFly: src/sys/dev/acpica5/acpi_toshiba/Makefile,v 1.4 2008/08/28 06:16:32 hasso Exp $
 
 KMOD=          acpi_toshiba
 CFLAGS+=       -I${.OBJDIR}/.. -I${.CURDIR}/..
 SRCS=          acpi_toshiba.c opt_acpi.h device_if.h bus_if.h
 
 .include <bsd.kmod.mk>
-.PATH:         ${SYSDIR}/${OSACPI_MD_DIR}
similarity index 99%
rename from sys/platform/pc32/acpica5/acpi_toshiba.c
rename to sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c
index e7793ef..25df543 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.10 2004/06/15 02:17:23 njl Exp $
- * $DragonFly: src/sys/platform/pc32/acpica5/Attic/acpi_toshiba.c,v 1.6 2007/10/23 03:04:49 y0netan1 Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c,v 1.1 2008/08/28 06:16:32 hasso Exp $
  */
 
 #include "opt_acpi.h"
index c3ebc64..39e13d0 100644 (file)
@@ -2,7 +2,7 @@
 # files marked standard are always included.
 #
 # $FreeBSD: src/sys/conf/files.i386,v 1.307.2.38 2003/01/02 20:41:33 kan Exp $
-# $DragonFly: src/sys/platform/pc32/conf/files,v 1.18 2008/07/28 01:21:39 swildner Exp $
+# $DragonFly: src/sys/platform/pc32/conf/files,v 1.19 2008/08/28 06:16:32 hasso Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -71,7 +71,6 @@ dev/serial/dgb/dgm.c                  optional        dgm
 ${OSACPI_MD_DIR}/OsdEnvironment.c      optional        acpi
 ${OSACPI_MD_DIR}/acpi_machdep.c                optional        acpi
 ${OSACPI_MD_DIR}/acpi_wakeup.c         optional        acpi
-${OSACPI_MD_DIR}/acpi_toshiba.c                optional        acpi_toshiba acpi
 acpi.h                                 optional        acpi            \
        dependency      "$S/${ACPICA_DIR}/include/acpi.h"               \
        compile-with    "cp $S/${ACPICA_DIR}/include/acpi.h ${.OBJDIR}/"        \