3 files changed, 21 insertions, 19 deletions
diff --git a/sys/modules/bhnd/Makefile b/sys/modules/bhnd/Makefile
index 19d239ec3e3d..955565934734 100644
--- a/sys/modules/bhnd/Makefile
+++ b/sys/modules/bhnd/Makefile
@@ -1,22 +1,36 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/bhnd
+.PATH: ${.CURDIR}/../../dev/bhnd/cores/chipc
+.PATH: ${.CURDIR}/../../dev/bhnd/cores/chipc/pwrctl
+.PATH: ${.CURDIR}/../../dev/bhnd/cores/pmu
 .PATH: ${.CURDIR}/../../dev/bhnd/nvram
 
 KMOD=	bhnd
-SRCS=	bhnd.c \
-	bhnd_subr.c
+SRCS=	bhnd.c bhnd_subr.c
+SRCS+=	bhnd_bus_if.c bhnd_bus_if.h
 
+# ChipCommon
+SRCS+=	chipc.c chipc_subr.c
+SRCS+=	bhnd_sprom_chipc.c \
+	bhnd_pmu_chipc.c \
+	bhnd_pwrctl.c bhnd_pwrctl_subr.c
+SRCS+=	bhnd_chipc_if.c bhnd_chipc_if.h
+
+# PMU
+SRCS+=	bhnd_pmu.c \
+	bhnd_pmu_core.c \
+	bhnd_pmu_subr.c
+SRCS+=	bhnd_pmu_if.c bhnd_pmu_if.h
+
+# NVRAM/SPROM
 SRCS+=	bhnd_nvram.c \
 	bhnd_nvram_parser.c \
 	bhnd_sprom.c \
 	bhnd_sprom_parser.c
 SRCS+=	bhnd_nvram_common.c
 SRCS+=	bhnd_nvram_map.h bhnd_nvram_map_data.h
-
-SRCS+=	bhnd_bus_if.c bhnd_bus_if.h \
-	bhnd_chipc_if.c bhnd_chipc_if.h \
-	bhnd_nvram_if.c bhnd_nvram_if.h
+SRCS+=	bhnd_nvram_if.c bhnd_nvram_if.h
 
 SRCS+=	device_if.h bus_if.h
 
diff --git a/sys/modules/bhnd/cores/Makefile b/sys/modules/bhnd/cores/Makefile
index cc45dfbe168f..3c7398e38582 100644
--- a/sys/modules/bhnd/cores/Makefile
+++ b/sys/modules/bhnd/cores/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	bhnd_chipc \
-	bhnd_pci \
+SUBDIR=	bhnd_pci \
 	bhnd_pci_hostb \
 	bhnd_pcib
 
diff --git a/sys/modules/bhnd/cores/bhnd_chipc/Makefile b/sys/modules/bhnd/cores/bhnd_chipc/Makefile
deleted file mode 100644
index b4ca2a64bd57..000000000000
--- a/sys/modules/bhnd/cores/bhnd_chipc/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/chipc
-
-KMOD=	bhnd_chipc
-SRCS=	chipc.c chipc_subr.c \
-	bhnd_sprom_chipc.c
-SRCS+=	device_if.h bus_if.h bhnd_bus_if.h \
-	bhnd_chipc_if.h bhnd_nvram_if.h
-
-.include <bsd.kmod.mk>