[Gc-linux-cvs] linux/drivers/misc Kconfig, 1.14, 1.15 Makefile, 1.10, 1.11

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/drivers/misc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/misc

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Kconfig	1 Feb 2009 18:29:35 -0000	1.14
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.15
***************
*** 110,121 ****
  	  say N here.

- config EEPROM_93CX6
- 	tristate "EEPROM 93CX6 support"
- 	---help---
- 	  This is a driver for the EEPROM chipsets 93c46 and 93c66.
- 	  The driver supports both read as well as write commands.
- 
- 	  If unsure, say N.
- 
  config SGI_IOC4
  	tristate "SGI IOC4 Base IO support"
--- 110,113 ----
***************
*** 143,147 ****
  	  Interface support (MMC_TIFM_SD)'.

!           To compile this driver as a module, choose M here: the module will
  	  be called tifm_core.

--- 135,139 ----
  	  Interface support (MMC_TIFM_SD)'.

! 	  To compile this driver as a module, choose M here: the module will
  	  be called tifm_core.

***************
*** 156,253 ****
  	  flash card format drivers, as outlined in the TIFM_CORE Help.

!           To compile this driver as a module, choose M here: the module will
  	  be called tifm_7xx1.

- config ACER_WMI
-         tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
- 	depends on X86
- 	depends on EXPERIMENTAL
- 	depends on ACPI
- 	depends on LEDS_CLASS
- 	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
- 	  wireless radio and bluetooth control, and on some laptops,
- 	  exposes the mail LED and LCD backlight.
- 
- 	  For more information about this driver see
- 	  <file:Documentation/laptops/acer-wmi.txt>
- 
- 	  If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
- 	  here.
- 
- config ASUS_LAPTOP
-         tristate "Asus Laptop Extras (EXPERIMENTAL)"
-         depends on X86
-         depends on ACPI
- 	depends on EXPERIMENTAL && !ACPI_ASUS
- 	depends on LEDS_CLASS
- 	depends on NEW_LEDS
- 	depends on BACKLIGHT_CLASS_DEVICE
-         ---help---
- 	  This is the new Linux driver for Asus laptops. It may also support some
- 	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
- 	  standard ACPI events that go through /proc/acpi/events. It also adds
- 	  support for video output switching, LCD backlight control, Bluetooth and
- 	  Wlan control, and most importantly, allows you to blink those fancy LEDs.
- 
- 	  For more information and a userspace daemon for handling the extra
- 	  buttons see <http://acpi4asus.sf.net/>.
- 
- 	  If you have an ACPI-compatible ASUS laptop, say Y or M here.
- 
- config FUJITSU_LAPTOP
-         tristate "Fujitsu Laptop Extras"
-         depends on X86
-         depends on ACPI
- 	depends on INPUT
-         depends on BACKLIGHT_CLASS_DEVICE
-         ---help---
- 	  This is a driver for laptops built by Fujitsu:
- 
- 	    * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
- 	    * Possibly other Fujitsu laptop models
- 	    * Tested with S6410 and S7020
- 
- 	  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
- 	depends on EXPERIMENTAL
- 	depends on ACPI
- 	select ACPI_WMI
- 	---help---
- 	  This is a driver for the WMI extensions (wireless and bluetooth power
- 	  control) of the HP Compaq TC1100 tablet.
- 
- config HP_WMI
-        tristate "HP WMI extras"
-        depends on ACPI_WMI
-        depends on INPUT
-        depends on RFKILL
-        help
-          Say Y here if you want to support WMI-based hotkeys on HP laptops and
- 	 to read data from WMI such as docking or ambient light sensor state.
- 
-          To compile this driver as a module, choose M here: the module will
-          be called hp-wmi.
- 
  config ICS932S401
  	tristate "Integrated Circuits ICS932S401"
--- 148,154 ----
  	  flash card format drivers, as outlined in the TIFM_CORE Help.

! 	  To compile this driver as a module, choose M here: the module will
  	  be called tifm_7xx1.

  config ICS932S401
  	tristate "Integrated Circuits ICS932S401"
***************
*** 260,427 ****
  	  will be called ics932s401.

- config MSI_LAPTOP
-         tristate "MSI Laptop Extras"
-         depends on X86
-         depends on ACPI
-         depends on BACKLIGHT_CLASS_DEVICE
-         ---help---
- 	  This is a driver for laptops built by MSI (MICRO-STAR
- 	  INTERNATIONAL):
- 
- 	  MSI MegaBook S270 (MS-1013)
- 	  Cytron/TCM/Medion/Tchibo MD96100/SAM2000
- 
- 	  It adds support for Bluetooth, WLAN and LCD brightness control.
- 
- 	  More information about this driver is available at
- 	  <http://0pointer.de/lennart/tchibo.html>.
- 
- 	  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
- 	depends on BACKLIGHT_CLASS_DEVICE
- 	---help---
- 	  This is a driver for laptops built by Compal:
- 
- 	  Compal FL90/IFL90
- 	  Compal FL91/IFL91
- 	  Compal FL92/JFL92
- 	  Compal FT00/IFT00
- 
- 	  It adds support for Bluetooth, WLAN and LCD brightness control.
- 
- 	  If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
- 
- config SONY_LAPTOP
- 	tristate "Sony Laptop Extras"
- 	depends on X86 && ACPI
- 	select BACKLIGHT_CLASS_DEVICE
- 	depends on INPUT
- 	  ---help---
- 	  This mini-driver drives the SNC and SPIC devices present in the ACPI
- 	  BIOS of the Sony Vaio laptops.
- 
- 	  It gives access to some extra laptop functionalities like Bluetooth,
- 	  screen brightness control, Fn keys and allows powering on/off some
- 	  devices.
- 
- 	  Read <file:Documentation/laptops/sony-laptop.txt> for more information.
- 
- config SONYPI_COMPAT
- 	bool "Sonypi compatibility"
- 	depends on SONY_LAPTOP
- 	  ---help---
- 	  Build the sonypi driver compatibility code into the sony-laptop driver.
- 
- config THINKPAD_ACPI
- 	tristate "ThinkPad ACPI Laptop Extras"
- 	depends on X86 && ACPI
- 	select BACKLIGHT_LCD_SUPPORT
- 	select BACKLIGHT_CLASS_DEVICE
- 	select HWMON
- 	select NVRAM
- 	select INPUT
- 	select NEW_LEDS
- 	select LEDS_CLASS
- 	select NET
- 	select RFKILL
- 	---help---
- 	  This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
- 	  support for Fn-Fx key combinations, Bluetooth control, video
- 	  output switching, ThinkLight control, UltraBay eject and more.
- 	  For more information about this driver see
- 	  <file:Documentation/laptops/thinkpad-acpi.txt> and
- 	  <http://ibm-acpi.sf.net/> .
- 
- 	  This driver was formerly known as ibm-acpi.
- 
- 	  If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
- 
- config THINKPAD_ACPI_DEBUG
- 	bool "Verbose debug mode"
- 	depends on THINKPAD_ACPI
- 	default n
- 	---help---
- 	  Enables extra debugging information, at the expense of a slightly
- 	  increase in driver size.
- 
- 	  If you are not sure, say N here.
- 
- config THINKPAD_ACPI_DOCK
- 	bool "Legacy Docking Station Support"
- 	depends on THINKPAD_ACPI
- 	depends on ACPI_DOCK=n
- 	default n
- 	---help---
- 	  Allows the thinkpad_acpi driver to handle docking station events.
- 	  This support was made obsolete by the generic ACPI docking station
- 	  support (CONFIG_ACPI_DOCK).  It will allow locking and removing the
- 	  laptop from the docking station, but will not properly connect PCI
- 	  devices.
- 
- 	  If you are not sure, say N here.
- 
- config THINKPAD_ACPI_BAY
- 	bool "Legacy Removable Bay Support"
- 	depends on THINKPAD_ACPI
- 	default y
- 	---help---
- 	  Allows the thinkpad_acpi driver to handle removable bays.  It will
- 	  electrically disable the device in the bay, and also generate
- 	  notifications when the bay lever is ejected or inserted.
- 
- 	  If you are not sure, say Y here.
- 
- config THINKPAD_ACPI_VIDEO
- 	bool "Video output control support"
- 	depends on THINKPAD_ACPI
- 	default y
- 	---help---
- 	  Allows the thinkpad_acpi driver to provide an interface to control
- 	  the various video output ports.
- 
- 	  This feature often won't work well, depending on ThinkPad model,
- 	  display state, video output devices in use, whether there is a X
- 	  server running, phase of the moon, and the current mood of
- 	  Schroedinger's cat.  If you can use X.org's RandR to control
- 	  your ThinkPad's video output ports instead of this feature,
- 	  don't think twice: do it and say N here to save some memory.
- 
- 	  If you are not sure, say Y here.
- 
- config THINKPAD_ACPI_HOTKEY_POLL
- 	bool "Support NVRAM polling for hot keys"
- 	depends on THINKPAD_ACPI
- 	default y
- 	---help---
- 	  Some thinkpad models benefit from NVRAM polling to detect a few of
- 	  the hot key press events.  If you know your ThinkPad model does not
- 	  need to do NVRAM polling to support any of the hot keys you use,
- 	  unselecting this option will save about 1kB of memory.
- 
- 	  ThinkPads T40 and newer, R52 and newer, and X31 and newer are
- 	  unlikely to need NVRAM polling in their latest BIOS versions.
- 
- 	  NVRAM polling can detect at most the following keys: ThinkPad/Access
- 	  IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute,
- 	  Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12).
- 
- 	  If you are not sure, say Y here.  The driver enables polling only if
- 	  it is strictly necessary to do so.
- 
  config ATMEL_SSC
  	tristate "Device driver for Atmel SSC peripheral"
--- 161,164 ----
***************
*** 436,464 ****
  	  If unsure, say N.

- config INTEL_MENLOW
- 	tristate "Thermal Management driver for Intel menlow platform"
- 	depends on ACPI_THERMAL
- 	select THERMAL
- 	depends on X86
- 	---help---
- 	  ACPI thermal management enhancement driver on
- 	  Intel Menlow platform.
- 
- 	  If unsure, say N.
- 
- config EEEPC_LAPTOP
- 	tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
- 	depends on X86
- 	depends on ACPI
- 	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.
- 
- 	  If you have an Eee PC laptop, say Y or M here.
- 
  config ENCLOSURE_SERVICES
  	tristate "Enclosure Services"
--- 173,176 ----
***************
*** 521,525 ****
--- 233,251 ----
  	you are unsure, say N.

+ config DELL_LAPTOP
+ 	tristate "Dell Laptop Extras (EXPERIMENTAL)"
+ 	depends on X86
+ 	depends on DCDBAS
+ 	depends on EXPERIMENTAL
+ 	depends on BACKLIGHT_CLASS_DEVICE
+ 	depends on RFKILL
+ 	depends on POWER_SUPPLY
+ 	default n
+ 	---help---
+ 	This driver adds support for rfkill and backlight control to Dell
+ 	laptops.
+ 
  source "drivers/misc/c2port/Kconfig"
+ source "drivers/misc/eeprom/Kconfig"

  endif # MISC_DEVICES

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	1 Feb 2009 18:29:35 -0000	1.10
--- Makefile	2 Mar 2009 19:26:37 -0000	1.11
***************
*** 2,20 ****
  # Makefile for misc devices that really don't fit anywhere else.
  #
- obj- := misc.o	# Dummy rule to force built-in.o to be made

  obj-$(CONFIG_IBM_ASM)		+= ibmasm/
  obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
- obj-$(CONFIG_ASUS_LAPTOP)	+= asus-laptop.o
- obj-$(CONFIG_EEEPC_LAPTOP)	+= eeepc-laptop.o
- obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
- obj-$(CONFIG_COMPAL_LAPTOP)	+= compal-laptop.o
- obj-$(CONFIG_ACER_WMI)		+= acer-wmi.o
  obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o
  obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
  obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
- obj-$(CONFIG_HP_WMI)		+= hp-wmi.o
  obj-$(CONFIG_ICS932S401)	+= ics932s401.o
- obj-$(CONFIG_TC1100_WMI)	+= tc1100-wmi.o
  obj-$(CONFIG_LKDTM)		+= lkdtm.o
  obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
--- 2,12 ----
***************
*** 22,31 ****
  obj-$(CONFIG_PHANTOM)		+= phantom.o
  obj-$(CONFIG_SGI_IOC4)		+= ioc4.o
- obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o
- obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o
- obj-$(CONFIG_FUJITSU_LAPTOP)	+= fujitsu-laptop.o
- obj-$(CONFIG_PANASONIC_LAPTOP)	+= panasonic-laptop.o
- obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
- obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o
  obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
  obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o
--- 14,17 ----
***************
*** 36,37 ****
--- 22,24 ----
  obj-$(CONFIG_GAMECUBE_GQR)	+= gcn-gqr.o
  obj-$(CONFIG_GAMECUBE_MI)	+= gcn-mi.o
+ obj-y				+= eeprom/