projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[powerpc.git]
/
arch
/
i386
/
pci
/
Makefile
diff --git
a/arch/i386/pci/Makefile
b/arch/i386/pci/Makefile
index
1594d2f
..
44650e0
100644
(file)
--- a/
arch/i386/pci/Makefile
+++ b/
arch/i386/pci/Makefile
@@
-1,7
+1,7
@@
obj-y := i386.o init.o
obj-$(CONFIG_PCI_BIOS) += pcbios.o
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o
mmconfig-shared.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
pci-y := fixup.o