From: Henrique de Moraes Holschuh Date: Wed, 18 Mar 2009 00:11:07 +0000 (-0300) Subject: Add patches accepted for 2.6.29-rc8 X-Git-Url: https://repo.or.cz/w/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commitdiff_plain/3a8265451cdfe4ad150a7bd0bffbfd118a5872ca Add patches accepted for 2.6.29-rc8 Signed-off-by: Henrique de Moraes Holschuh --- diff --git a/releases/upstream/2.6.29-rc8/0001-platform-x86-depends-instead-of-select-for-laptop-p.patch b/releases/upstream/2.6.29-rc8/0001-platform-x86-depends-instead-of-select-for-laptop-p.patch new file mode 100644 index 00000000000..3c2ebf639fb --- /dev/null +++ b/releases/upstream/2.6.29-rc8/0001-platform-x86-depends-instead-of-select-for-laptop-p.patch @@ -0,0 +1,38 @@ +From d263da311ab403e3a84fa24920edc826147a550c Mon Sep 17 00:00:00 2001 +From: Corentin Chary +Date: Wed, 25 Feb 2009 09:37:09 +0100 +Subject: platform/x86: depends instead of select for laptop platform drivers + +"I hate `select' and will gleefully leap on any s/select/depends/ patch, +whether it works or not :)" + Andrew Morton + +select INPUT is not needed here, because if someone doesn't want INPUT, +he won't want these drivers either. + +Signed-off-by: Corentin Chary +Signed-off-by: Len Brown +--- + drivers/platform/x86/Kconfig | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig +index fede8f3..f3ab401 100644 +--- a/drivers/platform/x86/Kconfig ++++ b/drivers/platform/x86/Kconfig +@@ -185,11 +185,11 @@ config SONYPI_COMPAT + config THINKPAD_ACPI + tristate "ThinkPad ACPI Laptop Extras" + depends on ACPI ++ depends on INPUT + select BACKLIGHT_LCD_SUPPORT + select BACKLIGHT_CLASS_DEVICE + select HWMON + select NVRAM +- select INPUT + select NEW_LEDS + select LEDS_CLASS + select NET +-- +1.6.2 + diff --git a/releases/upstream/2.6.29-rc8/0002-thinkpad-acpi-fix-module-autoloading-for-older-mode.patch b/releases/upstream/2.6.29-rc8/0002-thinkpad-acpi-fix-module-autoloading-for-older-mode.patch new file mode 100644 index 00000000000..c4e8ab3f86b --- /dev/null +++ b/releases/upstream/2.6.29-rc8/0002-thinkpad-acpi-fix-module-autoloading-for-older-mode.patch @@ -0,0 +1,58 @@ +From b36a50f92d1c4300a88f606b4d2bbdc4f442a2d7 Mon Sep 17 00:00:00 2001 +From: Mathieu Chouquet-Stringer +Date: Sat, 14 Mar 2009 16:35:26 +0100 +Subject: thinkpad-acpi: fix module autoloading for older models + +Looking at the source, there seems to be a missing * to match my DMI +string. I mean for newer IBM and Lenovo's laptops you match either one +of the following: +MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); +MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); + +While for older Thinkpads, you do this (for instance): +IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]"); + +with IBM_BIOS_MODULE_ALIAS being MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") + +Note there's no * terminating the string. As result, udev doesn't load +anything because modprobe cannot find anything matching this (my +machine actually): + +udevtest: run: '/sbin/modprobe dmi:bvnIBM:bvr1IET71WW(2.10):bd06/16/2006:svnIBM:pn236621U:pvrNotAv + +Signed-off-by: Mathieu Chouquet-Stringer +Acked-by: Henrique de Moraes Holschuh +Signed-off-by: Len Brown +--- + drivers/platform/x86/thinkpad_acpi.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c +index bcbc051..d243320 100644 +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); + * if it is not there yet. + */ + #define IBM_BIOS_MODULE_ALIAS(__type) \ +- MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") ++ MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") + + /* Non-ancient thinkpads */ + MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); +@@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); + /* Ancient thinkpad BIOSes have to be identified by + * BIOS type or model number, and there are far less + * BIOS types than model numbers... */ +-IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]"); +-IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]"); +-IBM_BIOS_MODULE_ALIAS("K[U,X-Z]"); ++IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]"); ++IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]"); ++IBM_BIOS_MODULE_ALIAS("K[UX-Z]"); + + MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh"); + MODULE_DESCRIPTION(TPACPI_DESC); +-- +1.6.2 +