HID: sony: Fix input device leak when connecting a DS4 twice using USB/BT

[mirror_ubuntu-zesty-kernel.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 060026a02f59246362aa9be2adb95b1304efe710..f6ca6a0d556889aa9b06c1ef32f4d01e47312a4a 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -55,14 +55,9 @@ obj-y                                += char/
 # iommu/ comes before gpu as gpu are using iommu controllers
 obj-$(CONFIG_IOMMU_SUPPORT)    += iommu/
 
-# gpu/ comes after char for AGP vs DRM startup and after iommu
-obj-y                          += gpu/
 
 obj-$(CONFIG_CONNECTOR)                += connector/
 
-# i810fb and intelfb depend on char/agp/
-obj-$(CONFIG_FB_I810)           += video/fbdev/i810/
-obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
 
 obj-$(CONFIG_PARPORT)          += parport/
 obj-$(CONFIG_NVM)              += lightnvm/
@@ -76,6 +71,12 @@ obj-$(CONFIG_IDE)            += ide/
 obj-$(CONFIG_SCSI)             += scsi/
 obj-y                          += nvme/
 obj-$(CONFIG_ATA)              += ata/
+
+# gpu/ comes after char for AGP vs DRM startup and after iommu
+obj-y                          += gpu/
+# i810fb and intelfb depend on char/agp/
+obj-$(CONFIG_FB_I810)           += video/fbdev/i810/
+obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
 obj-$(CONFIG_TARGET_CORE)      += target/
 obj-$(CONFIG_MTD)              += mtd/
 obj-$(CONFIG_SPI)              += spi/