Add patches accepted for 2.6.22-rc4
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / rejected / ibm-acpi_fix-Kconfig-entries-for-ibm-acpi-bay-and-dock.patch
blob1627a9b63bee28876565c7bdbc4026e2802aa204
1 REJECT:
2 We shall need bay support, so we'd need a different patch anyway.
4 From 088bb61f406a444448e8ba3848189be61da24fe6 Mon Sep 17 00:00:00 2001
5 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
6 Date: Sat, 30 Dec 2006 15:52:04 -0200
7 Subject: [PATCH] ACPI: ibm-acpi: fix Kconfig entries for ibm-acpi bay and dock
9 Support for ACPI_BAY has not been merged in mainline yet. Usage of
10 "depends on FOO=n" fails if FOO is undefined, thus ibm-acpi support
11 for bay was being made non-available in a kernel that has no other
12 sort of bay support.
14 Fix it to use "depends on ! FOO" instead, that does the right thing
15 when FOO is undefined. Fix ACPI_IBM_DOCK accordingly as well while
16 at it, and also improve the help text.
18 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
19 ---
20 drivers/acpi/Kconfig | 17 ++++++++++-------
21 1 files changed, 10 insertions(+), 7 deletions(-)
23 diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
24 index 3a27d58..aa4f78f 100644
25 --- a/drivers/acpi/Kconfig
26 +++ b/drivers/acpi/Kconfig
27 @@ -213,26 +213,29 @@ config ACPI_IBM
28 config ACPI_IBM_DOCK
29 bool "Legacy Docking Station Support"
30 depends on ACPI_IBM
31 - depends on ACPI_DOCK=n
32 - default n
33 + depends on ! ACPI_DOCK
34 + default y
35 ---help---
36 Allows the ibm_acpi driver to handle docking station events.
37 This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI. It will
38 allow locking and removing the laptop from the docking station,
39 but will not properly connect PCI devices.
41 - If you are not sure, say N here.
42 + If you are not sure, select ACPI_DOCK instead.
44 config ACPI_IBM_BAY
45 bool "Legacy Removable Bay Support"
46 depends on ACPI_IBM
47 - depends on ACPI_BAY=n
48 - default n
49 + depends on ! ACPI_BAY
50 + default y
51 ---help---
52 Allows the ibm_acpi driver to handle removable bays.
53 - This support is obsoleted by CONFIG_ACPI_BAY.
54 + This support is obsoleted by CONFIG_ACPI_BAY. It will allow
55 + enabling and disabling devices in the removable bays, but it
56 + will not properly add or remove the devices from the kernel,
57 + which must be done manually by userspace scripts.
59 - If you are not sure, say N here.
60 + If you are not sure, select ACPI_BAY instead if it is available.
62 config ACPI_TOSHIBA
63 tristate "Toshiba Laptop Extras"
64 --
65 1.4.4.4