Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 7a0438744053dac52a4afc082767621a419ecabe..24cd470146578dd9f73ae093381b588a24291115 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -16,10 +16,7 @@ obj-$(CONFIG_PINCTRL)                += pinctrl/
 obj-$(CONFIG_GPIOLIB)          += gpio/
 obj-y                          += pwm/
 
-obj-$(CONFIG_PCI)              += pci/
-obj-$(CONFIG_PCI_ENDPOINT)     += pci/endpoint/
-# PCI dwc controller drivers
-obj-y                          += pci/dwc/
+obj-y                          += pci/
 
 obj-$(CONFIG_PARISC)           += parisc/
 obj-$(CONFIG_RAPIDIO)          += rapidio/