diff options
author | Robert Richter <robert.richter@amd.com> | 2008-07-02 16:50:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 05:43:04 -0400 |
commit | 6d8566ac131f3dc3e976de824dcb04feaea4b14c (patch) | |
tree | 02bbc256611da2e4b157a0f31562a4918172efd0 /arch/x86/pci/Makefile_32 | |
parent | d028203c0446c7f65ed2b22342a56f03c6c4a6c1 (diff) |
x86/pci: Makefile merge: Removing Makefile_*
No functional nor ordering changes here.
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_32')
-rw-r--r-- | arch/x86/pci/Makefile_32 | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 deleted file mode 100644 index a34fbf557926..000000000000 --- a/arch/x86/pci/Makefile_32 +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | obj-y := i386.o init.o | ||
2 | |||
3 | obj-$(CONFIG_PCI_BIOS) += pcbios.o | ||
4 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_32.o direct.o mmconfig-shared.o | ||
5 | obj-$(CONFIG_PCI_DIRECT) += direct.o | ||
6 | obj-$(CONFIG_PCI_OLPC) += olpc.o | ||
7 | |||
8 | pci-y := fixup.o | ||
9 | |||
10 | # Do not change the ordering here. There is a nasty init function | ||
11 | # ordering dependency which breaks when you move acpi.o below | ||
12 | # legacy/irq.o | ||
13 | pci-$(CONFIG_ACPI) += acpi.o | ||
14 | pci-y += legacy.o irq.o | ||
15 | |||
16 | # Careful: VISWS overrule the pci-y above. The colons are | ||
17 | # therefor correct. This needs a proper fix by distangling the code. | ||
18 | pci-$(CONFIG_X86_VISWS) := visws.o fixup.o | ||
19 | |||
20 | pci-$(CONFIG_X86_NUMAQ) += numa.o | ||
21 | |||
22 | # Necessary for NUMAQ as well | ||
23 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o | ||
24 | |||
25 | obj-y += $(pci-y) common.o early.o | ||
26 | obj-y += amd_bus.o | ||