aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/Makefile
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-02 16:50:21 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 05:44:08 -0400
commit0b40e84ab750b4ba5fc8d6712c892502dc93b212 (patch)
tree64829eab15e88a74e55d5cf303838eb157ea9d03 /arch/x86/pci/Makefile
parent7fa71c0e0e371b995fdf3a367542a014c1f37f29 (diff)
x86/pci: Makefile merge: whitespace changes only
Signed-off-by: Robert Richter <robert.richter@amd.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/Makefile')
-rw-r--r--arch/x86/pci/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 8645094d7423..30944bc5252d 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -33,14 +33,14 @@ else
33# Makefile for X86_64 specific PCI routines 33# Makefile for X86_64 specific PCI routines
34# 34#
35 35
36obj-y := i386.o 36obj-y := i386.o
37obj-$(CONFIG_PCI_DIRECT)+= direct.o 37obj-$(CONFIG_PCI_DIRECT) += direct.o
38obj-y += fixup.o init.o 38obj-y += fixup.o init.o
39obj-$(CONFIG_ACPI) += acpi.o 39obj-$(CONFIG_ACPI) += acpi.o
40obj-y += legacy.o irq.o common.o early.o 40obj-y += legacy.o irq.o common.o early.o
41# mmconfig has a 64bit special 41# mmconfig has a 64bit special
42obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o 42obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
43 43
44obj-y += amd_bus.o 44obj-y += amd_bus.o
45 45
46endif 46endif