diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-10 00:27:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-10 00:27:26 -0400 |
| commit | 67e74fdd81349a92fcece318a5ee41714273eb01 (patch) | |
| tree | 77119ca53fac01f1ce31687c5d7ff6ec6e8a2dc3 /drivers/misc | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
| parent | 8ab7367f483d1d676d61fca58498a73b194dda82 (diff) | |
Pull randconfig into release branch
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 73e248fb2ff1..7b580c3152de 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -134,6 +134,7 @@ config SONY_LAPTOP | |||
| 134 | tristate "Sony Laptop Extras" | 134 | tristate "Sony Laptop Extras" |
| 135 | depends on X86 && ACPI | 135 | depends on X86 && ACPI |
| 136 | select BACKLIGHT_CLASS_DEVICE | 136 | select BACKLIGHT_CLASS_DEVICE |
| 137 | depends on INPUT | ||
| 137 | ---help--- | 138 | ---help--- |
| 138 | This mini-driver drives the SNC and SPIC devices present in the ACPI | 139 | This mini-driver drives the SNC and SPIC devices present in the ACPI |
| 139 | BIOS of the Sony Vaio laptops. | 140 | BIOS of the Sony Vaio laptops. |
| @@ -156,6 +157,7 @@ config THINKPAD_ACPI | |||
| 156 | select BACKLIGHT_CLASS_DEVICE | 157 | select BACKLIGHT_CLASS_DEVICE |
| 157 | select HWMON | 158 | select HWMON |
| 158 | select NVRAM | 159 | select NVRAM |
| 160 | depends on INPUT | ||
| 159 | ---help--- | 161 | ---help--- |
| 160 | This is a driver for the IBM and Lenovo ThinkPad laptops. It adds | 162 | This is a driver for the IBM and Lenovo ThinkPad laptops. It adds |
| 161 | support for Fn-Fx key combinations, Bluetooth control, video | 163 | support for Fn-Fx key combinations, Bluetooth control, video |