diff options
| author | dim <dim@FreeBSD.org> | 2015-09-16 22:35:59 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-16 22:35:59 +0000 |
| commit | 7b8be099124cf3848a48077ce37206e0ae691839 (patch) | |
| tree | a10b0ccdaab43b0969228c097ee584f3d7cd047d /sys/conf | |
| parent | ea5248cdc11d47e16b420831d52143ca4afb904a (diff) | |
| parent | 5cd19bff79afae9cad8bd02a758c794c84fa06be (diff) | |
| download | FreeBSD-src-7b8be099124cf3848a48077ce37206e0ae691839.zip FreeBSD-src-7b8be099124cf3848a48077ce37206e0ae691839.tar.gz | |
Merge ^/head r287680 through r287877.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.arm64 | 1 | ||||
| -rw-r--r-- | sys/conf/files.sparc64 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 399a35e..bcbcf00 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -59,6 +59,7 @@ dev/acpica/acpi_if.m optional acpi dev/fdt/fdt_arm64.c optional fdt dev/hwpmc/hwpmc_arm64.c optional hwpmc dev/hwpmc/hwpmc_arm64_md.c optional hwpmc +dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/mmc/host/dwmmc.c optional dwmmc dev/mmc/host/dwmmc_hisi.c optional dwmmc soc_hisi_hi6220 dev/ofw/ofw_cpu.c optional fdt diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 0c160d4..78f0428 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -82,6 +82,7 @@ sparc64/isa/isa_dma.c optional isa sparc64/isa/ofw_isa.c optional ebus | isa sparc64/pci/apb.c optional pci sparc64/pci/fire.c optional pci +sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci |
