diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-22 10:48:04 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-22 10:48:04 -0500 |
| commit | 4ef7d96463ed96314e05a7d706a3e217246e28a5 (patch) | |
| tree | 71a55913019a62af5b31f8d54acb917d5987cc97 /config-generic | |
| parent | 464a3b821827ab828737b633ebb9964e1c71e910 (diff) | |
| download | kernel-4ef7d96463ed96314e05a7d706a3e217246e28a5.tar.gz kernel-4ef7d96463ed96314e05a7d706a3e217246e28a5.tar.xz kernel-4ef7d96463ed96314e05a7d706a3e217246e28a5.zip | |
Linux v3.12-11097-ga5d6e63
- Drop all the keys-* patches because they were merged upstream. Yay!
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic index cf15d1442..cdbafb731 100644 --- a/config-generic +++ b/config-generic @@ -2247,6 +2247,8 @@ CONFIG_TIFM_7XX1=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m # CONFIG_TCG_TIS_I2C_INFINEON is not set +# CONFIG_TCG_TIS_I2C_ATMEL is not set +# CONFIG_TCG_TIS_I2C_NUVOTON is not set CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m # CONFIG_TCG_INFINEON is not set |