diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2010-06-08 17:51:21 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2010-06-08 17:51:21 +0000 |
| commit | 53a908cb07b62603e7463b92a7082cc341a46f0a (patch) | |
| tree | b2a34a603d54b633c7d7d23bda1b116b88e78568 /sys/conf | |
| parent | 8c52d7f70c6abad123588157b0498cab42ff6e98 (diff) | |
| download | src-53a908cb07b62603e7463b92a7082cc341a46f0a.tar.gz src-53a908cb07b62603e7463b92a7082cc341a46f0a.zip | |
Move the I/O APIC code to the x86 tree since it is identical on i386 and
amd64.
Notes
Notes:
svn path=/head/; revision=208919
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 4 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/conf/files.pc98 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index c0d5d7082d8d..87daee40744b 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -105,9 +105,7 @@ amd64/amd64/in_cksum.c optional inet amd64/amd64/initcpu.c standard amd64/amd64/intr_machdep.c standard amd64/amd64/io.c optional io -amd64/amd64/io_apic.c standard amd64/amd64/legacy.c standard -x86/x86/local_apic.c standard amd64/amd64/locore.S standard no-obj amd64/amd64/machdep.c standard amd64/amd64/mca.c standard @@ -306,3 +304,5 @@ x86/isa/isa.c standard x86/isa/isa_dma.c standard x86/isa/nmi.c standard x86/isa/orm.c optional isa +x86/x86/io_apic.c standard +x86/x86/local_apic.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 6b1307142932..c3f215b569f7 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -269,10 +269,8 @@ i386/i386/in_cksum.c optional inet i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard i386/i386/io.c optional io -i386/i386/io_apic.c optional apic i386/i386/k6_mem.c optional mem i386/i386/legacy.c optional native -x86/x86/local_apic.c optional apic i386/i386/locore.s optional native no-obj i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun @@ -390,3 +388,5 @@ x86/isa/isa.c optional isa x86/isa/isa_dma.c optional isa x86/isa/nmi.c standard x86/isa/orm.c optional isa +x86/x86/io_apic.c optional apic +x86/x86/local_apic.c optional apic diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index b60b29411b4a..d8482dbb16c5 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -148,10 +148,8 @@ i386/i386/in_cksum.c optional inet i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard i386/i386/io.c optional io -i386/i386/io_apic.c optional apic i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard -x86/x86/local_apic.c optional apic i386/i386/locore.s standard no-obj i386/i386/mca.c standard i386/i386/mem.c optional mem @@ -258,3 +256,5 @@ pc98/pc98/pc98_machdep.c standard # x86/isa/atpic.c optional atpic x86/isa/isa.c optional isa +x86/x86/io_apic.c optional apic +x86/x86/local_apic.c optional apic |