diff options
-rw-r--r-- | drivers/i2c/chips/Kconfig | 10 | ||||
-rw-r--r-- | drivers/i2c/chips/Makefile | 1 | ||||
-rw-r--r-- | drivers/misc/Kconfig | 10 | ||||
-rw-r--r-- | drivers/misc/Makefile | 1 | ||||
-rw-r--r-- | drivers/misc/ds1682.c (renamed from drivers/i2c/chips/ds1682.c) | 0 |
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index f9618f4d4e47..ae4539d99bef 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig | |||
@@ -6,16 +6,6 @@ | |||
6 | 6 | ||
7 | menu "Miscellaneous I2C Chip support" | 7 | menu "Miscellaneous I2C Chip support" |
8 | 8 | ||
9 | config DS1682 | ||
10 | tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm" | ||
11 | depends on EXPERIMENTAL | ||
12 | help | ||
13 | If you say yes here you get support for Dallas Semiconductor | ||
14 | DS1682 Total Elapsed Time Recorder. | ||
15 | |||
16 | This driver can also be built as a module. If so, the module | ||
17 | will be called ds1682. | ||
18 | |||
19 | config SENSORS_TSL2550 | 9 | config SENSORS_TSL2550 |
20 | tristate "Taos TSL2550 ambient light sensor" | 10 | tristate "Taos TSL2550 ambient light sensor" |
21 | depends on EXPERIMENTAL | 11 | depends on EXPERIMENTAL |
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile index 749cf3606294..fe0af0f81f2d 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile | |||
@@ -10,7 +10,6 @@ | |||
10 | # * I/O expander drivers go to drivers/gpio | 10 | # * I/O expander drivers go to drivers/gpio |
11 | # | 11 | # |
12 | 12 | ||
13 | obj-$(CONFIG_DS1682) += ds1682.o | ||
14 | obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o | 13 | obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o |
15 | 14 | ||
16 | ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) | 15 | ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index df1f86b5c83e..498ab3ebd448 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -246,6 +246,16 @@ config EP93XX_PWM | |||
246 | To compile this driver as a module, choose M here: the module will | 246 | To compile this driver as a module, choose M here: the module will |
247 | be called ep93xx_pwm. | 247 | be called ep93xx_pwm. |
248 | 248 | ||
249 | config DS1682 | ||
250 | tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm" | ||
251 | depends on I2C && EXPERIMENTAL | ||
252 | help | ||
253 | If you say yes here you get support for Dallas Semiconductor | ||
254 | DS1682 Total Elapsed Time Recorder. | ||
255 | |||
256 | This driver can also be built as a module. If so, the module | ||
257 | will be called ds1682. | ||
258 | |||
249 | source "drivers/misc/c2port/Kconfig" | 259 | source "drivers/misc/c2port/Kconfig" |
250 | source "drivers/misc/eeprom/Kconfig" | 260 | source "drivers/misc/eeprom/Kconfig" |
251 | source "drivers/misc/cb710/Kconfig" | 261 | source "drivers/misc/cb710/Kconfig" |
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index f982d2ecfde7..b6245e46e285 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
@@ -20,6 +20,7 @@ obj-$(CONFIG_SGI_GRU) += sgi-gru/ | |||
20 | obj-$(CONFIG_HP_ILO) += hpilo.o | 20 | obj-$(CONFIG_HP_ILO) += hpilo.o |
21 | obj-$(CONFIG_ISL29003) += isl29003.o | 21 | obj-$(CONFIG_ISL29003) += isl29003.o |
22 | obj-$(CONFIG_EP93XX_PWM) += ep93xx_pwm.o | 22 | obj-$(CONFIG_EP93XX_PWM) += ep93xx_pwm.o |
23 | obj-$(CONFIG_DS1682) += ds1682.o | ||
23 | obj-$(CONFIG_C2PORT) += c2port/ | 24 | obj-$(CONFIG_C2PORT) += c2port/ |
24 | obj-y += eeprom/ | 25 | obj-y += eeprom/ |
25 | obj-y += cb710/ | 26 | obj-y += cb710/ |
diff --git a/drivers/i2c/chips/ds1682.c b/drivers/misc/ds1682.c index f3ee4a1abb77..f3ee4a1abb77 100644 --- a/drivers/i2c/chips/ds1682.c +++ b/drivers/misc/ds1682.c | |||