From: Len Brown <len.brown@intel.com>
Date: Sat, 3 Feb 2007 06:12:39 +0000 (-0500)
Subject: Pull bay into test branch
X-Git-Tag: v2.6.21-rc1~92^2~32^2^2~8
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=1fcb71b84b05ff3bfd5b5b2eca9a9b3d13a76e3a;hp=-c;p=powerpc.git

Pull bay into test branch
---

1fcb71b84b05ff3bfd5b5b2eca9a9b3d13a76e3a
diff --combined drivers/acpi/Kconfig
index 50e295b08c,b4bb000a69..1422a11b5b
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -107,7 -107,7 +107,7 @@@ config ACPI_BUTTO
  
  config ACPI_VIDEO
  	tristate "Video"
 -	depends on X86
 +	depends on X86 && BACKLIGHT_CLASS_DEVICE
  	help
  	  This driver implement the ACPI Extensions For Display Adapters
  	  for integrated graphics devices on motherboard, as specified in
@@@ -139,6 -139,13 +139,13 @@@ config ACPI_DOC
  	help
  	  This driver adds support for ACPI controlled docking stations
  
+ config ACPI_BAY
+ 	tristate "Removable Drive Bay (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL
+ 	help
+ 	  This driver adds support for ACPI controlled removable drive
+ 	  bays such as the IBM ultrabay or the Dell Module Bay.
+ 
  config ACPI_PROCESSOR
  	tristate "Processor"
  	default y