[PATCH] W1: Move w1 bus master code into 'w1/masters' and move w1 slave code into 'w1/slaves'

Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 58 deletions

diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 4baf61a22327..5e61ed59a41e 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -11,63 +11,7 @@ config W1
           This W1 support can also be built as a module.  If so, the module
           will be called wire.ko.
 
-config W1_MATROX
-        tristate "Matrox G400 transport layer for 1-wire"
-        depends on W1 && PCI
-        help
-          Say Y here if you want to communicate with your 1-wire devices
-          using Matrox's G400 GPIO pins.
-
-          This support is also available as a module.  If so, the module
-          will be called matrox_w1.ko.
-
-config W1_DS9490
-        tristate "DS9490R transport layer driver"
-        depends on W1 && USB
-        help
-          Say Y here if you want to have a driver for DS9490R UWB <-> W1 bridge.
-
-          This support is also available as a module.  If so, the module
-          will be called ds9490r.ko.
-
-config W1_DS9490_BRIDGE
-        tristate "DS9490R USB <-> W1 transport layer for 1-wire"
-        depends on W1_DS9490
-        help
-          Say Y here if you want to communicate with your 1-wire devices
-          using DS9490R USB bridge.
-
-          This support is also available as a module.  If so, the module
-          will be called ds_w1_bridge.ko.
-
-config W1_THERM
-        tristate "Thermal family implementation"
-        depends on W1
-        help
-          Say Y here if you want to connect 1-wire thermal sensors to you
-          wire.
-
-config W1_SMEM
-        tristate "Simple 64bit memory family implementation"
-        depends on W1
-        help
-          Say Y here if you want to connect 1-wire
-          simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
-
-config W1_DS2433
-        tristate "4kb EEPROM family support (DS2433)"
-        depends on W1
-        help
-          Say Y here if you want to use a 1-wire
-          4kb EEPROM family device (DS2433).
-
-config W1_DS2433_CRC
-        bool "Protect DS2433 data with a CRC16"
-        depends on W1_DS2433
-        select CRC16
-        help
-          Say Y here to protect DS2433 data with a CRC16.
-          Each block has 30 bytes of data and a two byte CRC16.
-          Full block writes are only allowed if the CRC is valid.
+source drivers/w1/masters/Kconfig
+source drivers/w1/slaves/Kconfig
 
 endmenu