The patch titled
ACPI_IBM_BAY can not coexist with ACPI_BAY
has been added to the -mm tree. Its filename is
acpi_ibm_bay-can-not-coexist-with-acpi_bay.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ACPI_IBM_BAY can not coexist with ACPI_BAY
From: Chris Wedgwood <cw@xxxxxxxx>
ACPI_IBM_BAY cannot coexist with ACPI_BAY --- it causes the IBM ACPI code
to fail to initialize so all the IBM ACPI functionality is missing. The
simplest fix is to just make sure the Kconfig magic disallows ACPI_IBM_BAY
when ACPI_BAY is enabled.
Signed-off-by: Chris Wedgwood <cw@xxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/acpi/Kconfig~acpi_ibm_bay-can-not-coexist-with-acpi_bay drivers/acpi/Kconfig
--- a/drivers/acpi/Kconfig~acpi_ibm_bay-can-not-coexist-with-acpi_bay
+++ a/drivers/acpi/Kconfig
@@ -245,7 +245,7 @@ config ACPI_IBM_DOCK
config ACPI_IBM_BAY
bool "Legacy Removable Bay Support"
- depends on ACPI_IBM
+ depends on ACPI_IBM && !ACPI_BAY
default y
---help---
Allows the ibm_acpi driver to handle removable bays. It will allow
_
Patches currently in -mm which might be from cw@xxxxxxxx are
acpi_ibm_bay-can-not-coexist-with-acpi_bay.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
