summaryrefslogtreecommitdiffstats
path: root/config-arm-omap-generic
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2011-08-16 11:41:15 -0500
committerDennis Gilmore <dennis@ausil.us>2011-08-16 11:41:15 -0500
commite153256415d572b089a2eda40c7a1abfd9f6fd48 (patch)
treeed4e8005707d95b22bb0e21d5bc4cd04f98754fc /config-arm-omap-generic
parent53fe9c977abcf0cf29fe9e804b0510e1a4784c9e (diff)
downloadkernel-e153256415d572b089a2eda40c7a1abfd9f6fd48.tar.gz
kernel-e153256415d572b089a2eda40c7a1abfd9f6fd48.tar.xz
kernel-e153256415d572b089a2eda40c7a1abfd9f6fd48.zip
disable crystalhd module on the generic arm qemu build
but enable it on the others disable tpm on arm build in mmc_block on tegra build
Diffstat (limited to 'config-arm-omap-generic')
-rw-r--r--config-arm-omap-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index df7ab065a..12a6e30e3 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -415,7 +415,6 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_GPIO is not set
@@ -1097,3 +1096,5 @@ CONFIG_LIBCRC32C=y
# CONFIG_BT_ATH3K is not set
# CONFIG_BT_WILINK is not set
# CONFIG_USB_HSO is not set
+
+CONFIG_CRYSTALHD=m