From e0d799c683d94bbe6ae17cf22f36f8f3387c8e2e Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Sat, 16 Jul 2005 13:11:11 +0000 Subject: [PATCH] enable the TCG stuff as modules; ATMEL, NSC, etc svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3558 --- debian/arch/alpha/config | 3 --- debian/arch/amd64/config | 1 - debian/arch/amd64/config.default | 1 - debian/arch/config | 7 +++++++ debian/arch/i386/config | 3 --- debian/arch/ia64/config | 3 --- debian/arch/powerpc/config | 3 --- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index b047c6671..1e6a448a8 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -1099,9 +1099,6 @@ CONFIG_DRM_SIS=m CONFIG_SYNCLINK_CS=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 -CONFIG_TCG_TPM=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_ALGOBIT=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 115db490d..f301da543 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -1078,7 +1078,6 @@ CONFIG_HPET=y CONFIG_HPET_MMAP=y CONFIG_MAX_RAW_DEVS=256 CONFIG_HANGCHECK_TIMER=m -# CONFIG_TCG_TPM is not set CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_ALGOBIT=m diff --git a/debian/arch/amd64/config.default b/debian/arch/amd64/config.default index 731ca7955..2df9cfdcf 100644 --- a/debian/arch/amd64/config.default +++ b/debian/arch/amd64/config.default @@ -711,7 +711,6 @@ CONFIG_MAX_RAW_DEVS=256 # # TPM devices # -# CONFIG_TCG_TPM is not set # # I2C support diff --git a/debian/arch/config b/debian/arch/config index cf6a2d38f..fd12aebf2 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -173,3 +173,10 @@ CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_SECCOMP=y +# CONFIG_IP_ROUTE_MULTIPATH_RR is not set +# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set +# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set +# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_NSC=m diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 27be1dbc1..0a56ce4ca 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1263,9 +1263,6 @@ CONFIG_HPET=y CONFIG_HPET_MMAP=y CONFIG_MAX_RAW_DEVS=256 CONFIG_HANGCHECK_TIMER=m -# CONFIG_TCG_TPM is not set -# CONFIG_TCG_NSC is not set -# CONFIG_TCG_ATMEL is not set CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_ALGOBIT=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index c0a619d75..8e071d671 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -845,9 +845,6 @@ CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 CONFIG_HANGCHECK_TIMER=m # CONFIG_MMTIMER is not set -CONFIG_TCG_TPM=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_ALGOBIT=m diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 0ac41a42d..38ca07826 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -833,9 +833,6 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_SYNCLINK_CS=m # CONFIG_RAW_DRIVER is not set -CONFIG_TCG_TPM=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_ALGOBIT=y