Remove dev/uart/uart_if.m from the default MFILES (in kmod.mk) and

instead define MFILES appropriately for the uart(4) module build.

2 files changed, 5 insertions, 1 deletions

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index a681e4beab18..b4d7a7003449 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -320,7 +320,7 @@ MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \
 	dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
 	dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
 	dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
-	dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m dev/uart/uart_if.m \
+	dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \
 	dev/usb/usb_if.m isa/isa_if.m \
 	kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \
 	libkern/iconv_converter_if.m opencrypto/crypto_if.m \
diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index 6a8f285590c7..88125ae92a60 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -15,4 +15,8 @@ SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
 SRCS+=	bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
 	power_if.h uart_if.h pccarddevs.h
 
+MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
+	dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \
+	kern/device_if.m
+
 .include <bsd.kmod.mk>