summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-02 22:50:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:44:08 +0200
commit0b40e84ab750b4ba5fc8d6712c892502dc93b212 (patch)
tree64829eab15e88a74e55d5cf303838eb157ea9d03
parent7fa71c0e0e371b995fdf3a367542a014c1f37f29 (diff)
downloadop-kernel-dev-0b40e84ab750b4ba5fc8d6712c892502dc93b212.zip
op-kernel-dev-0b40e84ab750b4ba5fc8d6712c892502dc93b212.tar.gz
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>
-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 8645094..30944bc 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -33,14 +33,14 @@ else
# Makefile for X86_64 specific PCI routines
#
-obj-y := i386.o
-obj-$(CONFIG_PCI_DIRECT)+= direct.o
-obj-y += fixup.o init.o
-obj-$(CONFIG_ACPI) += acpi.o
-obj-y += legacy.o irq.o common.o early.o
+obj-y := i386.o
+obj-$(CONFIG_PCI_DIRECT) += direct.o
+obj-y += fixup.o init.o
+obj-$(CONFIG_ACPI) += acpi.o
+obj-y += legacy.o irq.o common.o early.o
# mmconfig has a 64bit special
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
-obj-y += amd_bus.o
+obj-y += amd_bus.o
endif
OpenPOWER on IntegriCloud