---

yaml --- r: 101983 b: refs/heads/master c: 20b9373 h: refs/heads/master i: 101981: 051c1b5 101979: 633c4a0 101975: ca37b7b 101967: 6e75f09 101951: f017871 v: v3
git-mirror · Jul 16, 2008 · 85851dc · 85851dc
1 parent 0c55f51
commit 85851dc
Show file tree

Hide file tree

Showing 4 changed files with 793 additions and 53 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 706546d02384b64e083bd9130c56eaa599c66038
+refs/heads/master: 20b937343e55c16e37b1a4ad2176760b4a11002c
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1792,6 +1792,12 @@ P:	David Howells
 M:	dhowells@redhat.com
 S:	Maintained
 
+FUJITSU LAPTOP EXTRAS
+P:	Jonathan Woithe
+M:	jwoithe@physics.adelaide.edu.au
+L:	linux-acpi@vger.kernel.org
+S:	Maintained
+
 FUSE: FILESYSTEM IN USERSPACE
 P:	Miklos Szeredi
 M:	miklos@szeredi.hu

diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig
@@ -185,11 +185,22 @@ config FUJITSU_LAPTOP
 
 	    * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
 	    * Possibly other Fujitsu laptop models
+	    * Tested with S6410 and S7020
 
-	  It adds support for LCD brightness control.
+	  It adds support for LCD brightness control and some hotkeys.
 
 	  If you have a Fujitsu laptop, say Y or M here.
 
+config FUJITSU_LAPTOP_DEBUG
+	bool "Verbose debug mode for Fujitsu Laptop Extras"
+	depends on FUJITSU_LAPTOP
+	default n
+	---help---
+	  Enables extra debug output from the fujitsu extras driver, at the
+	  expense of a slight increase in driver size.
+
+	  If you are not sure, say N here.
+
 config TC1100_WMI
 	tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
 	depends on X86 && !X86_64