[Midnightbsd-cvs] src: Makefile: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/modules/uart:
        Makefile (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/uart/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/modules/uart/Makefile -L sys/modules/uart/Makefile -u -r1.1.1.1 -r1.2
--- sys/modules/uart/Makefile
+++ sys/modules/uart/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/uart/Makefile,v 1.13 2004/11/20 23:38:48 marcel Exp $
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.16 2006/10/16 22:11:53 jb Exp $
 
 .PATH: ${.CURDIR}/../../dev/uart
 
@@ -9,10 +9,20 @@
 
 KMOD=	uart
 SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
-	uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \
-	uart_dbg.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \
-	uart_if.c uart_subr.c uart_tty.c
+	uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \
+	uart_core.c uart_dbg.c \
+	uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \
+	uart_if.c uart_if.h uart_subr.c uart_tty.c
+.if ${MACHINE} == "sun4v"
+SRCS+=	uart_cpu_sparc64.c
+.else
+SRCS+=	uart_cpu_${MACHINE}.c
+.endif
 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
+	power_if.h pccarddevs.h serdev_if.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 kern/serdev_if.m
 
 .include <bsd.kmod.mk>