Merge commit 'main-jb-2012.08.03-B4' into t114-0806

[linux-2.6.git] / drivers / misc / Makefile

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index e45055dc508da23fa3b4ba27cd9e9f17a7416ed4..89def1668c6eb973464593f2cfe411cc773083aa 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -1,6 +1,7 @@
 #
 # Makefile for misc devices that really don't fit anywhere else.
 #
+GCOV_PROFILE_tegra-cryptodev.o := y
 
 obj-$(CONFIG_IBM_ASM)          += ibmasm/
 obj-$(CONFIG_AD525X_DPOT)      += ad525x_dpot.o
@@ -13,13 +14,12 @@ obj-$(CONFIG_ATMEL_TCLIB)   += atmel_tclib.o
 obj-$(CONFIG_BMP085)           += bmp085.o
 obj-$(CONFIG_ICS932S401)       += ics932s401.o
 obj-$(CONFIG_LKDTM)            += lkdtm.o
-obj-$(CONFIG_TIFM_CORE)        += tifm_core.o
-obj-$(CONFIG_TIFM_7XX1)        += tifm_7xx1.o
+obj-$(CONFIG_TIFM_CORE)                += tifm_core.o
+obj-$(CONFIG_TIFM_7XX1)                += tifm_7xx1.o
 obj-$(CONFIG_PHANTOM)          += phantom.o
 obj-$(CONFIG_SENSORS_BH1780)   += bh1780gli.o
 obj-$(CONFIG_SENSORS_BH1770)   += bh1770glc.o
 obj-$(CONFIG_SENSORS_APDS990X) += apds990x.o
-obj-$(CONFIG_ANDROID_PMEM)     += pmem.o
 obj-$(CONFIG_SGI_IOC4)         += ioc4.o
 obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 obj-$(CONFIG_KERNEL_DEBUGGER_CORE)     += kernel_debugger.o
@@ -50,5 +50,18 @@ obj-$(CONFIG_AB8500_PWM)     += ab8500-pwm.o
 obj-y                          += lis3lv02d/
 obj-y                          += carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
+obj-$(CONFIG_ALTERA_STAPL)     +=altera-stapl/
+obj-$(CONFIG_MAX8997_MUIC)     += max8997-muic.o
 obj-$(CONFIG_WL127X_RFKILL)    += wl127x-rfkill.o
+obj-$(CONFIG_SENSORS_AK8975)   += akm8975.o
+obj-$(CONFIG_SENSORS_NCT1008)  += nct1008.o
+obj-$(CONFIG_BCM4329_RFKILL)   += bcm4329_rfkill.o
+obj-$(CONFIG_INV_SENSORS)      += inv_mpu/
+CFLAGS_tegra-cryptodev.o        = -Werror
+obj-$(CONFIG_TEGRA_CRYPTO_DEV) += tegra-cryptodev.o
+obj-$(CONFIG_TEGRA_BB_SUPPORT) += tegra-baseband/
+obj-$(CONFIG_TEGRA_CEC_SUPPORT)        += tegra-cec/
+obj-$(CONFIG_MAX1749_VIBRATOR) += max1749.o
 obj-$(CONFIG_APANIC)           += apanic.o
+obj-$(CONFIG_THERM_EST)                += therm_est.o
+obj-$(CONFIG_TEGRA_THROUGHPUT) += tegra-throughput.o