Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tsl2550: Move from i2c/chips to misc

Move the last remaining driver from i2c/chips to misc. Good ridance!

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>

+14 -41
-1
drivers/i2c/Kconfig
··· 73 73 74 74 source drivers/i2c/algos/Kconfig 75 75 source drivers/i2c/busses/Kconfig 76 - source drivers/i2c/chips/Kconfig 77 76 78 77 config I2C_DEBUG_CORE 79 78 bool "I2C Core debugging messages"
+1 -1
drivers/i2c/Makefile
··· 6 6 obj-$(CONFIG_I2C) += i2c-core.o 7 7 obj-$(CONFIG_I2C_SMBUS) += i2c-smbus.o 8 8 obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o 9 - obj-y += busses/ chips/ algos/ 9 + obj-y += algos/ busses/ 10 10 11 11 ifeq ($(CONFIG_I2C_DEBUG_CORE),y) 12 12 EXTRA_CFLAGS += -DDEBUG
-19
drivers/i2c/chips/Kconfig
··· 1 - # 2 - # Miscellaneous I2C chip drivers configuration 3 - # 4 - # *** DEPRECATED! Do not add new entries! See Makefile *** 5 - # 6 - 7 - menu "Miscellaneous I2C Chip support" 8 - 9 - config SENSORS_TSL2550 10 - tristate "Taos TSL2550 ambient light sensor" 11 - depends on EXPERIMENTAL 12 - help 13 - If you say yes here you get support for the Taos TSL2550 14 - ambient light sensor. 15 - 16 - This driver can also be built as a module. If so, the module 17 - will be called tsl2550. 18 - 19 - endmenu
-18
drivers/i2c/chips/Makefile
··· 1 - # 2 - # Makefile for miscellaneous I2C chip drivers. 3 - # 4 - # Do not add new drivers to this directory! It is DEPRECATED. 5 - # 6 - # Device drivers are better grouped according to the functionality they 7 - # implement rather than to the bus they are connected to. In particular: 8 - # * Hardware monitoring chip drivers go to drivers/hwmon 9 - # * RTC chip drivers go to drivers/rtc 10 - # * I/O expander drivers go to drivers/gpio 11 - # 12 - 13 - obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o 14 - 15 - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) 16 - EXTRA_CFLAGS += -DDEBUG 17 - endif 18 -
+2 -2
drivers/i2c/chips/tsl2550.c drivers/misc/tsl2550.c
··· 47 47 struct i2c_client *client; 48 48 struct mutex update_lock; 49 49 50 - unsigned int power_state : 1; 51 - unsigned int operating_mode : 1; 50 + unsigned int power_state:1; 51 + unsigned int operating_mode:1; 52 52 }; 53 53 54 54 /*
+10
drivers/misc/Kconfig
··· 268 268 This driver can also be built as a module. If so, the module 269 269 will be called isl29003. 270 270 271 + config SENSORS_TSL2550 272 + tristate "Taos TSL2550 ambient light sensor" 273 + depends on I2C && SYSFS 274 + help 275 + If you say yes here you get support for the Taos TSL2550 276 + ambient light sensor. 277 + 278 + This driver can also be built as a module. If so, the module 279 + will be called tsl2550. 280 + 271 281 config EP93XX_PWM 272 282 tristate "EP93xx PWM support" 273 283 depends on ARCH_EP93XX
+1
drivers/misc/Makefile
··· 21 21 obj-$(CONFIG_CS5535_MFGPT) += cs5535-mfgpt.o 22 22 obj-$(CONFIG_HP_ILO) += hpilo.o 23 23 obj-$(CONFIG_ISL29003) += isl29003.o 24 + obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o 24 25 obj-$(CONFIG_EP93XX_PWM) += ep93xx_pwm.o 25 26 obj-$(CONFIG_DS1682) += ds1682.o 26 27 obj-$(CONFIG_TI_DAC7512) += ti_dac7512.o