diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/misc/Kconfig | |
parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r-- | drivers/misc/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index d9aac2e65391..2da1781e85c3 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -498,6 +498,18 @@ config SGI_GRU_DEBUG | |||
498 | This option enables addition debugging code for the SGI GRU driver. If | 498 | This option enables addition debugging code for the SGI GRU driver. If |
499 | you are unsure, say N. | 499 | you are unsure, say N. |
500 | 500 | ||
501 | config DELL_LAPTOP | ||
502 | tristate "Dell Laptop Extras (EXPERIMENTAL)" | ||
503 | depends on X86 | ||
504 | depends on DCDBAS | ||
505 | depends on EXPERIMENTAL | ||
506 | depends on BACKLIGHT_CLASS_DEVICE | ||
507 | depends on RFKILL | ||
508 | default n | ||
509 | ---help--- | ||
510 | This driver adds support for rfkill and backlight control to Dell | ||
511 | laptops. | ||
512 | |||
501 | source "drivers/misc/c2port/Kconfig" | 513 | source "drivers/misc/c2port/Kconfig" |
502 | 514 | ||
503 | endif # MISC_DEVICES | 515 | endif # MISC_DEVICES |