diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:16:47 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:16:47 +0200 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/i386/pci/Makefile | |
| parent | [PATCH] Fix reference of uninitialised memory in ata_device_add() (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-3b9f6cb8a1ec791be79c6c7595fea922f12d1e64.tar.xz linux-3b9f6cb8a1ec791be79c6c7595fea922f12d1e64.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/pci/Makefile')
| -rw-r--r-- | arch/i386/pci/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile index 62ad75c57e6a..1594d2f55c8f 100644 --- a/arch/i386/pci/Makefile +++ b/arch/i386/pci/Makefile @@ -11,4 +11,4 @@ pci-y += legacy.o irq.o pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o -obj-y += $(pci-y) common.o +obj-y += $(pci-y) common.o early.o |