Merge branch 'drivers-platform' into release

Conflicts:
	drivers/misc/Kconfig

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 0 insertions, 13 deletions

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 5de863a0e395..9cf8ae6e4b39 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -1,33 +1,20 @@
 #
 # Makefile for misc devices that really don't fit anywhere else.
 #
-obj- := misc.o  # Dummy rule to force built-in.o to be made
 
 obj-$(CONFIG_IBM_ASM)           += ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)     += hdpuftrs/
-obj-$(CONFIG_ASUS_LAPTOP)       += asus-laptop.o
-obj-$(CONFIG_EEEPC_LAPTOP)      += eeepc-laptop.o
-obj-$(CONFIG_MSI_LAPTOP)        += msi-laptop.o
-obj-$(CONFIG_COMPAL_LAPTOP)     += compal-laptop.o
-obj-$(CONFIG_ACER_WMI)          += acer-wmi.o
 obj-$(CONFIG_ATMEL_PWM)         += atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)         += atmel-ssc.o
 obj-$(CONFIG_ATMEL_TCLIB)       += atmel_tclib.o
-obj-$(CONFIG_HP_WMI)            += hp-wmi.o
 obj-$(CONFIG_ICS932S401)        += ics932s401.o
-obj-$(CONFIG_TC1100_WMI)        += tc1100-wmi.o
 obj-$(CONFIG_LKDTM)             += lkdtm.o
 obj-$(CONFIG_TIFM_CORE)         += tifm_core.o
 obj-$(CONFIG_DELL_LAPTOP)       += dell-laptop.o
 obj-$(CONFIG_TIFM_7XX1)         += tifm_7xx1.o
 obj-$(CONFIG_PHANTOM)           += phantom.o
 obj-$(CONFIG_SGI_IOC4)          += ioc4.o
-obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
-obj-$(CONFIG_THINKPAD_ACPI)     += thinkpad_acpi.o
-obj-$(CONFIG_FUJITSU_LAPTOP)    += fujitsu-laptop.o
-obj-$(CONFIG_PANASONIC_LAPTOP)  += panasonic-laptop.o
 obj-$(CONFIG_EEPROM_93CX6)      += eeprom_93cx6.o
-obj-$(CONFIG_INTEL_MENLOW)      += intel_menlow.o
 obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 obj-$(CONFIG_KGDB_TESTS)        += kgdbts.o
 obj-$(CONFIG_SGI_XP)            += sgi-xp/