Merge tag 'v3.10.64' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 130abc1dfd65419688ec4195e2925c302a5d673f..812d49135aa830d191cc3e19814ccf6f0945cbf9 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_RESET_CONTROLLER)        += reset/
 # default.
 obj-y                          += tty/
 obj-y                          += char/
-
+obj-$(CONFIG_STAGING)          += staging/
 # gpu/ comes after char for AGP vs DRM startup
 obj-y                          += gpu/
 
@@ -55,6 +55,7 @@ obj-$(CONFIG_FB_I810)           += video/i810/
 obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 
 obj-$(CONFIG_PARPORT)          += parport/
+obj-$(CONFIG_INPUT)            += input/
 obj-y                          += base/ block/ misc/ mfd/ nfc/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += macintosh/
@@ -88,7 +89,6 @@ obj-$(CONFIG_PCI)             += usb/
 obj-$(CONFIG_USB_GADGET)       += usb/
 obj-$(CONFIG_SERIO)            += input/serio/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
-obj-$(CONFIG_INPUT)            += input/
 obj-$(CONFIG_I2O)              += message/
 obj-$(CONFIG_RTC_LIB)          += rtc/
 obj-y                          += i2c/ media/
@@ -111,6 +111,7 @@ obj-$(CONFIG_CPU_IDLE)              += cpuidle/
 obj-y                          += mmc/
 obj-$(CONFIG_MEMSTICK)         += memstick/
 obj-y                          += leds/
+obj-$(CONFIG_SWITCH)           += switch/
 obj-$(CONFIG_INFINIBAND)       += infiniband/
 obj-$(CONFIG_SGI_SN)           += sn/
 obj-y                          += firmware/
@@ -129,7 +130,6 @@ obj-$(CONFIG_SSB)           += ssb/
 obj-$(CONFIG_BCMA)             += bcma/
 obj-$(CONFIG_VHOST_RING)       += vhost/
 obj-$(CONFIG_VLYNQ)            += vlynq/
-obj-$(CONFIG_STAGING)          += staging/
 obj-y                          += platform/
 #common clk code
 obj-y                          += clk/