[linux] 01/02: w1: Disable W1_MASTER_MATROX

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 4764f3dc4e3c466df71cdd332f5a4b0db9551e8d
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Nov 13 23:27:39 2016 +0000

    w1: Disable W1_MASTER_MATROX
---
 debian/changelog     | 1 +
 debian/config/config | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a489df9..0459498 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 at debian.org>  Sat, 05 Nov 2016 23:17:01 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 06baf95..033f47a 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git