aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2012-04-11 02:42:01 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2012-04-11 02:42:01 +0000
commit2059ee3cc05bbf1f49aa335ca5ca0dd63757d304 (patch)
treebba47e1ed24bb6d2a34c4d30f0f6b64b009a8446 /sys/conf
parent53e98d5a48eafe088ef6b225d2ddbc0b1796ae84 (diff)
downloadsrc-2059ee3cc05bbf1f49aa335ca5ca0dd63757d304.tar.gz
src-2059ee3cc05bbf1f49aa335ca5ca0dd63757d304.zip
uart_cpu_amd64.c and uart_cpu_i386.c (under sys/dev/uart) are
identical now that the bus spaces are unified under sys/x86. Replace them with a single uart_cpu_x86.c. o delete uart_cpu_i386.c o move uart_cpu_amd64.c to uart_cpu_x86.c o update files.amd64 and files.i386 accordingly.
Notes
Notes: svn path=/head/; revision=234118
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 4a6ed09031e6..bfa2c104b0b7 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -267,7 +267,7 @@ dev/syscons/scvtb.c optional sc
dev/tpm/tpm.c optional tpm
dev/tpm/tpm_acpi.c optional tpm acpi
dev/tpm/tpm_isa.c optional tpm isa
-dev/uart/uart_cpu_amd64.c optional uart
+dev/uart/uart_cpu_x86.c optional uart
dev/viawd/viawd.c optional viawd
dev/wbwd/wbwd.c optional wbwd
dev/wpi/if_wpi.c optional wpi
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 1599e8e95731..668850af2513 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -244,7 +244,7 @@ dev/syscons/scvtb.c optional sc
dev/tpm/tpm.c optional tpm
dev/tpm/tpm_acpi.c optional tpm acpi
dev/tpm/tpm_isa.c optional tpm isa
-dev/uart/uart_cpu_i386.c optional uart
+dev/uart/uart_cpu_x86.c optional uart
dev/viawd/viawd.c optional viawd
dev/acpica/acpi_if.m standard
dev/acpi_support/acpi_wmi_if.m standard