| Message ID | 1301431053-5221-2-git-send-email-manoj.iyer@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 03/29/2011 02:37 PM, Manoj Iyer wrote: > This patch was submitted upstream and acked by maintainer but not yet in > linus tree. > > Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com> > > BugLink: http://launchpad.net/bugs/745217 > --- > drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index babc4d4..e2cce36 100644 > --- 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 */ > @@ -3882,7 +3883,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}, > }; > Acked-by: Tim Gardner <tim.gardner@canonical.com>
On 03/29/2011 01:37 PM, Manoj Iyer wrote: > This patch was submitted upstream and acked by maintainer but not yet in > linus tree. > > Signed-off-by: Manoj Iyer<manoj.iyer@canonical.com> > > BugLink: http://launchpad.net/bugs/745217 > --- > drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index babc4d4..e2cce36 100644 > --- 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 */ > @@ -3882,7 +3883,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}, > }; > Acked-by: Brad Figg <brad.figg@canonical.com>
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index babc4d4..e2cce36 100644 --- 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 */ @@ -3882,7 +3883,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}, };
This patch was submitted upstream and acked by maintainer but not yet in linus tree. Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> BugLink: http://launchpad.net/bugs/745217 --- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)