diff options
author | Jean Delvare <khali@linux-fr.org> | 2011-03-21 12:59:35 -0400 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2011-03-21 12:59:35 -0400 |
commit | 39c3e721d65793373e7bc6f5dad0591ef6d09268 (patch) | |
tree | fd88c93eebeebbbfa75b04769d7c8734c93222df /drivers | |
parent | ccd32e735de7a941906e093f8dca924bb05c5794 (diff) |
Let Kconfig handle lis3lv02d dependencies
The dependencies between the various lis3lv02d drivers make it
impossible to split them to different directories, while we really
want to do this. Move handling of dependencies from Makefile to
Kconfig, to make the move possible at all.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Eric Piel <eric.piel@tremplin-utc.net>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
Tested-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/Kconfig | 43 | ||||
-rw-r--r-- | drivers/hwmon/Makefile | 9 |
2 files changed, 25 insertions, 27 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 1bfb4439e4e1..c48101cf58f4 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -2,6 +2,12 @@ | |||
2 | # Hardware monitoring chip drivers configuration | 2 | # Hardware monitoring chip drivers configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | config SENSORS_LIS3LV02D | ||
6 | tristate | ||
7 | depends on INPUT | ||
8 | select INPUT_POLLDEV | ||
9 | default n | ||
10 | |||
5 | menuconfig HWMON | 11 | menuconfig HWMON |
6 | tristate "Hardware Monitoring support" | 12 | tristate "Hardware Monitoring support" |
7 | depends on HAS_IOMEM | 13 | depends on HAS_IOMEM |
@@ -1218,7 +1224,7 @@ config SENSORS_ULTRA45 | |||
1218 | config SENSORS_LIS3_SPI | 1224 | config SENSORS_LIS3_SPI |
1219 | tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)" | 1225 | tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)" |
1220 | depends on !ACPI && SPI_MASTER && INPUT | 1226 | depends on !ACPI && SPI_MASTER && INPUT |
1221 | select INPUT_POLLDEV | 1227 | select SENSORS_LIS3LV02D |
1222 | default n | 1228 | default n |
1223 | help | 1229 | help |
1224 | This driver provides support for the LIS3LV02Dx accelerometer connected | 1230 | This driver provides support for the LIS3LV02Dx accelerometer connected |
@@ -1235,7 +1241,7 @@ config SENSORS_LIS3_SPI | |||
1235 | config SENSORS_LIS3_I2C | 1241 | config SENSORS_LIS3_I2C |
1236 | tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)" | 1242 | tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)" |
1237 | depends on I2C && INPUT | 1243 | depends on I2C && INPUT |
1238 | select INPUT_POLLDEV | 1244 | select SENSORS_LIS3LV02D |
1239 | default n | 1245 | default n |
1240 | help | 1246 | help |
1241 | This driver provides support for the LIS3LV02Dx accelerometer connected | 1247 | This driver provides support for the LIS3LV02Dx accelerometer connected |
@@ -1296,35 +1302,24 @@ config SENSORS_ATK0110 | |||
1296 | This driver can also be built as a module. If so, the module | 1302 | This driver can also be built as a module. If so, the module |
1297 | will be called asus_atk0110. | 1303 | will be called asus_atk0110. |
1298 | 1304 | ||
1299 | config SENSORS_LIS3LV02D | 1305 | config HP_ACCEL |
1300 | tristate "STMicroeletronics LIS3* three-axis digital accelerometer" | 1306 | tristate "HP laptop accelerometer" |
1301 | depends on INPUT | 1307 | depends on INPUT |
1302 | select INPUT_POLLDEV | 1308 | select SENSORS_LIS3LV02D |
1303 | select NEW_LEDS | 1309 | select NEW_LEDS |
1304 | select LEDS_CLASS | 1310 | select LEDS_CLASS |
1305 | default n | 1311 | default n |
1306 | help | 1312 | help |
1307 | This driver provides support for the LIS3* accelerometers, such as the | 1313 | This driver provides support for the "Mobile Data Protection System 3D" |
1308 | LIS3LV02DL or the LIS331DL. In particular, it can be found in a number | 1314 | or "3D DriveGuard" feature of HP laptops. On such systems the driver |
1309 | of HP laptops, which have the "Mobile Data Protection System 3D" or | 1315 | should load automatically (via ACPI alias). |
1310 | "3D DriveGuard" feature. On such systems the driver should load | ||
1311 | automatically (via ACPI alias). The accelerometer might also be found | ||
1312 | in other systems, connected via SPI or I2C. The accelerometer data is | ||
1313 | readable via /sys/devices/platform/lis3lv02d. | ||
1314 | 1316 | ||
1315 | This driver also provides an absolute input class device, allowing | 1317 | Support for a led indicating disk protection will be provided as |
1316 | a laptop to act as a pinball machine-esque joystick. It provides also | 1318 | hp::hddprotect. For more information on the feature, refer to |
1317 | a misc device which can be used to detect free-fall. On HP laptops, | 1319 | Documentation/hwmon/lis3lv02d. |
1318 | if the led infrastructure is activated, support for a led indicating | ||
1319 | disk protection will be provided as hp::hddprotect. For more | ||
1320 | information on the feature, refer to Documentation/hwmon/lis3lv02d. | ||
1321 | 1320 | ||
1322 | This driver can also be built as modules. If so, the core module | 1321 | To compile this driver as a module, choose M here: the module will |
1323 | will be called lis3lv02d and a specific module for HP laptops will be | 1322 | be called hp_accel. |
1324 | called hp_accel. | ||
1325 | |||
1326 | Say Y here if you have an applicable laptop and want to experience | ||
1327 | the awesome power of lis3lv02d. | ||
1328 | 1323 | ||
1329 | endif # ACPI | 1324 | endif # ACPI |
1330 | 1325 | ||
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 8a238dec5691..94bf27482979 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
@@ -5,8 +5,12 @@ | |||
5 | obj-$(CONFIG_HWMON) += hwmon.o | 5 | obj-$(CONFIG_HWMON) += hwmon.o |
6 | obj-$(CONFIG_HWMON_VID) += hwmon-vid.o | 6 | obj-$(CONFIG_HWMON_VID) += hwmon-vid.o |
7 | 7 | ||
8 | # Helper drivers | ||
9 | obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o | ||
10 | |||
8 | # APCI drivers | 11 | # APCI drivers |
9 | obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o | 12 | obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o |
13 | obj-$(CONFIG_HP_ACCEL) += hp_accel.o | ||
10 | 14 | ||
11 | # Native drivers | 15 | # Native drivers |
12 | # asb100, then w83781d go first, as they can override other drivers' addresses. | 16 | # asb100, then w83781d go first, as they can override other drivers' addresses. |
@@ -63,9 +67,8 @@ obj-$(CONFIG_SENSORS_JZ4740) += jz4740-hwmon.o | |||
63 | obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o | 67 | obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o |
64 | obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o | 68 | obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o |
65 | obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o | 69 | obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o |
66 | obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o | 70 | obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o |
67 | obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d.o lis3lv02d_spi.o | 71 | obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o |
68 | obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d.o lis3lv02d_i2c.o | ||
69 | obj-$(CONFIG_SENSORS_LM63) += lm63.o | 72 | obj-$(CONFIG_SENSORS_LM63) += lm63.o |
70 | obj-$(CONFIG_SENSORS_LM70) += lm70.o | 73 | obj-$(CONFIG_SENSORS_LM70) += lm70.o |
71 | obj-$(CONFIG_SENSORS_LM73) += lm73.o | 74 | obj-$(CONFIG_SENSORS_LM73) += lm73.o |