aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@linux01.gwdg.de>2007-07-16 02:39:31 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:40 -0400
commit7126b75c8794f9fffda227d08b7ad1e138fa2c6c (patch)
tree70a9364574e2e855322ccc17526240ecf367c828 /drivers
parent79e508a4b8f405f9c9c3dbbd19d84717f42431ef (diff)
Use menuconfig objects II - TPM
Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Cc: Kylene Hall <kjhall@us.ibm.com> Cc: Marcel Selhorst <tpm@selhorst.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/Kconfig18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index dc4e1ff7f56f..8f3f7620f95a 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -2,11 +2,9 @@
2# TPM device configuration 2# TPM device configuration
3# 3#
4 4
5menu "TPM devices" 5menuconfig TCG_TPM
6 depends on HAS_IOMEM
7
8config TCG_TPM
9 tristate "TPM Hardware Support" 6 tristate "TPM Hardware Support"
7 depends on HAS_IOMEM
10 depends on EXPERIMENTAL 8 depends on EXPERIMENTAL
11 ---help--- 9 ---help---
12 If you have a TPM security chip in your system, which 10 If you have a TPM security chip in your system, which
@@ -21,9 +19,11 @@ config TCG_TPM
21 Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI 19 Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI
22 and CONFIG_PNPACPI. 20 and CONFIG_PNPACPI.
23 21
22if TCG_TPM
23
24config TCG_TIS 24config TCG_TIS
25 tristate "TPM Interface Specification 1.2 Interface" 25 tristate "TPM Interface Specification 1.2 Interface"
26 depends on TCG_TPM && PNPACPI 26 depends on PNPACPI
27 ---help--- 27 ---help---
28 If you have a TPM security chip that is compliant with the 28 If you have a TPM security chip that is compliant with the
29 TCG TIS 1.2 TPM specification say Yes and it will be accessible 29 TCG TIS 1.2 TPM specification say Yes and it will be accessible
@@ -32,7 +32,7 @@ config TCG_TIS
32 32
33config TCG_NSC 33config TCG_NSC
34 tristate "National Semiconductor TPM Interface" 34 tristate "National Semiconductor TPM Interface"
35 depends on TCG_TPM && PNPACPI 35 depends on PNPACPI
36 ---help--- 36 ---help---
37 If you have a TPM security chip from National Semiconductor 37 If you have a TPM security chip from National Semiconductor
38 say Yes and it will be accessible from within Linux. To 38 say Yes and it will be accessible from within Linux. To
@@ -41,7 +41,6 @@ config TCG_NSC
41 41
42config TCG_ATMEL 42config TCG_ATMEL
43 tristate "Atmel TPM Interface" 43 tristate "Atmel TPM Interface"
44 depends on TCG_TPM
45 ---help--- 44 ---help---
46 If you have a TPM security chip from Atmel say Yes and it 45 If you have a TPM security chip from Atmel say Yes and it
47 will be accessible from within Linux. To compile this driver 46 will be accessible from within Linux. To compile this driver
@@ -49,7 +48,7 @@ config TCG_ATMEL
49 48
50config TCG_INFINEON 49config TCG_INFINEON
51 tristate "Infineon Technologies TPM Interface" 50 tristate "Infineon Technologies TPM Interface"
52 depends on TCG_TPM && PNPACPI 51 depends on PNPACPI
53 ---help--- 52 ---help---
54 If you have a TPM security chip from Infineon Technologies 53 If you have a TPM security chip from Infineon Technologies
55 (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it 54 (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it
@@ -59,5 +58,4 @@ config TCG_INFINEON
59 Further information on this driver and the supported hardware 58 Further information on this driver and the supported hardware
60 can be found at http://www.prosec.rub.de/tpm 59 can be found at http://www.prosec.rub.de/tpm
61 60
62endmenu 61endif # TCG_TPM
63