The patch titled
IRDA: add some IBM think pads
has been added to the -mm tree. Its filename is
irda-add-some-ibm-think-pads.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: IRDA: add some IBM think pads
From: Ben Collins <bcollins@xxxxxxxxxx>
[UBUNTU:nsc-ircc] Add some IBM think pads
Add Thinkpad T60/X60/Z60/T43/R52 Infrared driver support.
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=7b8d2713435a9fb69719a282ba75e117f3f76a5b
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/irda/nsc-ircc.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff -puN drivers/net/irda/nsc-ircc.c~irda-add-some-ibm-think-pads drivers/net/irda/nsc-ircc.c
--- 25/drivers/net/irda/nsc-ircc.c~irda-add-some-ibm-think-pads Mon Jun 19 17:48:28 2006
+++ 25-akpm/drivers/net/irda/nsc-ircc.c Mon Jun 19 17:48:28 2006
@@ -115,8 +115,12 @@ static nsc_chip_t chips[] = {
/* Contributed by Jan Frey - IBM A30/A31 */
{ "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff,
nsc_ircc_probe_39x, nsc_ircc_init_39x },
- { "IBM", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,
- nsc_ircc_probe_39x, nsc_ircc_init_39x },
+ /* IBM ThinkPads using PC8738x (T60/X60/Z60) */
+ { "IBM-PC8738x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,
+ nsc_ircc_probe_39x, nsc_ircc_init_39x },
+ /* IBM ThinkPads using PC8394T (T43/R52/?) */
+ { "IBM-PC8394T", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf9, 0xff,
+ nsc_ircc_probe_39x, nsc_ircc_init_39x },
{ NULL }
};
_
Patches currently in -mm which might be from bcollins@xxxxxxxxxx are
ich7-sci_en-quirk-required-for-macbook.patch
asus_acpi-invert-read-of-wled-proc-file-to-show-correct.patch
acpi-sony-add-fn-hotkey-support.patch
git-ieee1394.patch
irda-add-some-ibm-think-pads.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
