diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-07-03 08:35:12 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-07-03 08:35:12 +0100 |
| commit | d2f56f31818e9472761b0f78d510bf1ddfcf319d (patch) | |
| tree | a871de24aacb409a4db3c7ae1b9749180e7e6661 /buildconfigs | |
| parent | 5c8c8991dac203dcd5e50c55f80e3b33323f9d02 (diff) | |
| parent | 402e6028307a7d7bc0fc82cfc0832f79689b6a9c (diff) | |
| download | xen-d2f56f31818e9472761b0f78d510bf1ddfcf319d.tar.gz xen-d2f56f31818e9472761b0f78d510bf1ddfcf319d.tar.bz2 xen-d2f56f31818e9472761b0f78d510bf1ddfcf319d.zip | |
Merge with xen-ia64-unstable.hg
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/linux-defconfig_xen_x86_32 | 1 | ||||
| -rw-r--r-- | buildconfigs/linux-defconfig_xen_x86_64 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/buildconfigs/linux-defconfig_xen_x86_32 b/buildconfigs/linux-defconfig_xen_x86_32 index 1b0597a8a1..db25f1717c 100644 --- a/buildconfigs/linux-defconfig_xen_x86_32 +++ b/buildconfigs/linux-defconfig_xen_x86_32 @@ -1902,6 +1902,7 @@ CONFIG_HANGCHECK_TIMER=m # TPM devices # CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m diff --git a/buildconfigs/linux-defconfig_xen_x86_64 b/buildconfigs/linux-defconfig_xen_x86_64 index 25596cddaa..b891318b2b 100644 --- a/buildconfigs/linux-defconfig_xen_x86_64 +++ b/buildconfigs/linux-defconfig_xen_x86_64 @@ -1765,6 +1765,7 @@ CONFIG_HANGCHECK_TIMER=m # TPM devices # CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m |