diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-11-13 23:27:39 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-13 23:27:39 +0000 |
| commit | 4764f3dc4e3c466df71cdd332f5a4b0db9551e8d (patch) | |
| tree | 82265acaf0729667e030e899f111bc92cec31490 | |
| parent | abd19bbc532c162f66ff2aa9b365bcd0471a3448 (diff) | |
w1: Disable W1_MASTER_MATROX
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/config/config | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a489df980..0459498d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ linux (4.9~rc5-1~exp1) UNRELEASED; urgency=medium 4.5~rc4-1~exp1 * [x86] ethernet: Enable ENA_ETHERNET as module * [x86] efi: Prevent mixed mode boot corruption with CONFIG_VMAP_STACK=y + * w1: Disable W1_MASTER_MATROX -- Aurelien Jarno <aurel32@debian.org> Sat, 05 Nov 2016 23:17:01 +0100 diff --git a/debian/config/config b/debian/config/config index 06baf957d..033f47a60 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4871,7 +4871,7 @@ CONFIG_W1_CON=y ## ## file: drivers/w1/masters/Kconfig ## -CONFIG_W1_MASTER_MATROX=m +# CONFIG_W1_MASTER_MATROX is not set CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m # CONFIG_W1_MASTER_DS1WM is not set |