Diff of /drivers/misc/Kconfig [a144b3] .. [4c6651] Maximize Restore

  Switch to side-by-side view

--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -15,7 +15,7 @@
 
 config ATMEL_PWM
 	tristate "Atmel AT32/AT91 PWM support"
-	depends on AVR32 || ARCH_AT91
+	depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
 	help
 	  This option enables device driver support for the PWM channels
 	  on certain Atmel prcoessors.  Pulse Width Modulation is used for
@@ -58,23 +58,23 @@
 config GAMECUBE_GQR
 	tristate "Nintendo GameCube/Wii Graphic Quantization Registers (GQR)"
 	depends on GAMECUBE_COMMON
-	---help---
+	help
           This option enables device driver support for the Gekko/Broadway
-	  processor's Graphic Quantization Registers.
-	  These registers are used with the psql and psqst instrutions.
+	  processors' Graphic Quantization Registers.
+	  These registers are used with the psql and psqst instructions.
 	  The registers will appear in /proc/sys/gqr.
 
 config GAMECUBE_MI
 	tristate "Nintendo GameCube Memory Interface (MI)"
-	depends on GAMECUBE && BROKEN
+	depends on GAMECUBE
 	help
 	  If you say yes to this option, support will be included for the
 	  Memory Interface (MI) of the Nintendo GameCube.
-	  
+
 	  The MI allows one to setup up to four protected memory regions,
 	  catching invalid accesses to them. The MI catches out of bounds
 	  memory accesses too.
-	  
+
 	  If in doubt, say N here.
 
 config IBM_ASM
@@ -167,6 +167,7 @@
 	depends on NEW_LEDS
 	depends on BACKLIGHT_CLASS_DEVICE
 	depends on SERIO_I8042
+	depends on RFKILL
 	select ACPI_WMI
 	---help---
 	  This is a driver for newer Acer (and Wistron) laptops. It adds
@@ -248,10 +249,20 @@
          To compile this driver as a module, choose M here: the module will
          be called hp-wmi.
 
+config ICS932S401
+	tristate "Integrated Circuits ICS932S401"
+	depends on I2C && EXPERIMENTAL
+	help
+	  If you say yes here you get support for the Integrated Circuits
+	  ICS932S401 clock control chips.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called ics932s401.
+
 config MSI_LAPTOP
         tristate "MSI Laptop Extras"
         depends on X86
-        depends on ACPI_EC
+        depends on ACPI
         depends on BACKLIGHT_CLASS_DEVICE
         ---help---
 	  This is a driver for laptops built by MSI (MICRO-STAR
@@ -267,10 +278,21 @@
 
 	  If you have an MSI S270 laptop, say Y or M here.
 
+config PANASONIC_LAPTOP
+	tristate "Panasonic Laptop Extras"
+	depends on X86 && INPUT && ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+	---help---
+	  This driver adds support for access to backlight control and hotkeys
+	  on Panasonic Let's Note laptops.
+
+	  If you have a Panasonic Let's note laptop (such as the R1(N variant),
+	  R2, R3, R5, T2, W2 and Y2 series), say Y.
+
 config COMPAL_LAPTOP
 	tristate "Compal Laptop Extras"
 	depends on X86
-	depends on ACPI_EC
+	depends on ACPI
 	depends on BACKLIGHT_CLASS_DEVICE
 	---help---
 	  This is a driver for laptops built by Compal:
@@ -431,6 +453,7 @@
 	depends on BACKLIGHT_CLASS_DEVICE
 	depends on HWMON
 	depends on EXPERIMENTAL
+	depends on RFKILL
 	---help---
 	  This driver supports the Fn-Fx keys on Eee PC laptops.
 	  It also adds the ability to switch camera/wlan on/off.
@@ -497,4 +520,6 @@
 	This option enables addition debugging code for the SGI GRU driver. If
 	you are unsure, say N.
 
+source "drivers/misc/c2port/Kconfig"
+
 endif # MISC_DEVICES