Merge branch 'eeepc-laptop' into release

2984397a · Len Brown · b07f07e0 · 4194e2f5 · 2984397a · 2984397a
Commit 2984397a authored Jan 20, 2010 by Len Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 164 additions and 135 deletions

drivers/platform/x86/Kconfig drivers/platform/x86/Kconfig +1 -0

drivers/platform/x86/eeepc-laptop.c drivers/platform/x86/eeepc-laptop.c +163 -135

No files found.
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -364,6 +364,7 @@ config EEEPC_LAPTOP
 	select HWMON
 	select LEDS_CLASS
 	select NEW_LEDS
+	select INPUT_SPARSEKMAP
 	---help---
 	  This driver supports the Fn-Fx keys on Eee PC laptops.

--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c