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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
Makefile
diff --git
a/arch/mips/cavium-octeon/Makefile
b/arch/mips/cavium-octeon/Makefile
index
7c0528b
..
d6903c3
100644
(file)
--- a/
arch/mips/cavium-octeon/Makefile
+++ b/
arch/mips/cavium-octeon/Makefile
@@
-14,9
+14,5
@@
obj-y += dma-octeon.o flash_setup.o
obj-y += octeon-memcpy.o
obj-$(CONFIG_SMP) += smp.o
-obj-$(CONFIG_PCI) += pci-common.o
-obj-$(CONFIG_PCI) += pci.o
-obj-$(CONFIG_PCI) += pcie.o
-obj-$(CONFIG_PCI_MSI) += msi.o
EXTRA_CFLAGS += -Werror