git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
arch
/
i386
/
pci
/
Makefile
diff --git
a/arch/i386/pci/Makefile
b/arch/i386/pci/Makefile
index
ead6122
..
62ad75c
100644
(file)
--- a/
arch/i386/pci/Makefile
+++ b/
arch/i386/pci/Makefile
@@
-1,7
+1,7
@@
-obj-y := i386.o
+obj-y := i386.o
init.o
obj-$(CONFIG_PCI_BIOS) += pcbios.o
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
direct.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
pci-y := fixup.o