Merge commit 'main-jb-2012.08.03-B4' into t114-0806
[linux-2.6.git] / drivers / misc / Makefile
index f931c73..89def16 100644 (file)
@@ -57,9 +57,11 @@ 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