On Thu, 19 May 2011, Greg KH wrote: > 2.6.38-stable review patch. If anyone has any objections, please let us know.
No objections. I am just replying to note that this patch is useful to all current stable and longterm releases. > ------------------ > > From: Manoj Iyer <[email protected]> > > commit 9fbdaeb4f4dd14a0caa9fc35c496d5440c251a3a upstream. > > The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead > of IBM0068. Added new HID so that thinkpad_acpi module will > auto load on these newer Lenovo ThinkPads. > > Acked-by: Henrique de Moraes Holschuh <[email protected]> > Signed-off-by: Manoj Iyer <[email protected]> > Signed-off-by: Andy Lutomirski <[email protected]> > Signed-off-by: Matthew Garrett <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > --- > drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -128,7 +128,8 @@ enum { > }; > > /* ACPI HIDs */ > -#define TPACPI_ACPI_HKEY_HID "IBM0068" > +#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068" > +#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068" > #define TPACPI_ACPI_EC_HID "PNP0C09" > > /* Input IDs */ > @@ -3879,7 +3880,8 @@ errexit: > } > > static const struct acpi_device_id ibm_htk_device_ids[] = { > - {TPACPI_ACPI_HKEY_HID, 0}, > + {TPACPI_ACPI_IBM_HKEY_HID, 0}, > + {TPACPI_ACPI_LENOVO_HKEY_HID, 0}, > {"", 0}, > }; > > > -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
