i2c/chips: Move ds1682 to drivers/misc

As i2c/chips is deprecated, move ds1682 to a more apropriate location.
Build tested.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index f9618f4d4e476a3530f6023fe400c1e7e038f835..ae4539d99befa8349c046a9f60789eb5935671fe 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -6,16 +6,6 @@
 
 menu "Miscellaneous I2C Chip support"
 
-config DS1682
-       tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
-       depends on EXPERIMENTAL
-       help
-         If you say yes here you get support for Dallas Semiconductor
-         DS1682 Total Elapsed Time Recorder.
-
-         This driver can also be built as a module.  If so, the module
-         will be called ds1682.
-
 config SENSORS_TSL2550
        tristate "Taos TSL2550 ambient light sensor"
        depends on EXPERIMENTAL

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 749cf360629416bd734c031ce268b6b4254b0a86..fe0af0f81f2d74261dfd39661499c54062ea2ffc 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -10,7 +10,6 @@
 # * I/O expander drivers go to drivers/gpio
 #
 
-obj-$(CONFIG_DS1682)           += ds1682.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index df1f86b5c83e417586f96f707aadfa3acd397aa9..498ab3ebd4482f22e0b31f15c361ae8f35f42332 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -246,6 +246,16 @@ config EP93XX_PWM
          To compile this driver as a module, choose M here: the module will
          be called ep93xx_pwm.
 
+config DS1682
+       tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Dallas Semiconductor
+         DS1682 Total Elapsed Time Recorder.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ds1682.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index f982d2ecfde7c16f56f2fdb50cb8640d43b1b627..b6245e46e285ef3d637b7cc414df09a681a9f803 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_SGI_GRU)         += sgi-gru/
 obj-$(CONFIG_HP_ILO)           += hpilo.o
 obj-$(CONFIG_ISL29003)         += isl29003.o
 obj-$(CONFIG_EP93XX_PWM)       += ep93xx_pwm.o
+obj-$(CONFIG_DS1682)           += ds1682.o
 obj-$(CONFIG_C2PORT)           += c2port/
 obj-y                          += eeprom/
 obj-y                          += cb710/

diff --git a/drivers/i2c/chips/ds1682.c b/drivers/misc/ds1682.c
similarity index 100%
rename from drivers/i2c/chips/ds1682.c
rename to drivers/misc/ds1682.c