diff --git a/debian/arch/i386/config.386 b/debian/arch/i386/config.386
index 4038f38af..0db3d5b0e 100644
--- a/debian/arch/i386/config.386
+++ b/debian/arch/i386/config.386
@@ -1979,9 +1979,9 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
 
 #
 # I2C support
diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686
index c3a5b6ee7..c3a422ad7 100644
--- a/debian/arch/i386/config.686
+++ b/debian/arch/i386/config.686
@@ -1957,9 +1957,9 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
 
 #
 # I2C support
diff --git a/debian/arch/i386/config.686-smp b/debian/arch/i386/config.686-smp
index 2e92f0aea..68b569cd1 100644
--- a/debian/arch/i386/config.686-smp
+++ b/debian/arch/i386/config.686-smp
@@ -1932,9 +1932,9 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
 
 #
 # I2C support
diff --git a/debian/arch/i386/config.default b/debian/arch/i386/config.default
index c3a5b6ee7..c3a422ad7 100644
--- a/debian/arch/i386/config.default
+++ b/debian/arch/i386/config.default
@@ -1957,9 +1957,9 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
 
 #
 # I2C support
diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7
index a8d4e6e27..e38b37a8e 100644
--- a/debian/arch/i386/config.k7
+++ b/debian/arch/i386/config.k7
@@ -1958,9 +1958,9 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
 
 #
 # I2C support
diff --git a/debian/arch/i386/config.k7-smp b/debian/arch/i386/config.k7-smp
index 670ed7847..4b84b25c1 100644
--- a/debian/arch/i386/config.k7-smp
+++ b/debian/arch/i386/config.k7-smp
@@ -1933,9 +1933,9 @@ CONFIG_HANGCHECK_TIMER=m
 #
 # TPM devices
 #
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
 
 #
 # I2C support