diff --git a/[refs] b/[refs] index 4547b3238de6..6bbb541d874d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a873403d387c34c4466cc81649acc8acd66874d +refs/heads/master: 30841711c88dc2d9ce31bfa3fa5479aa823804cf diff --git a/trunk/drivers/w1/Kconfig b/trunk/drivers/w1/Kconfig index 0c6c4359bf7b..f2d9a08e89ae 100644 --- a/trunk/drivers/w1/Kconfig +++ b/trunk/drivers/w1/Kconfig @@ -12,7 +12,7 @@ config W1 will be called wire.ko. config W1_CON - depends on CONNECTOR + depends on CONNECTOR && W1 bool "Userspace communication over connector" default y --- help ---