diff options
| author | Ben Collins <bcollins@ubuntu.com> | 2006-06-26 00:02:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-26 00:02:47 -0700 |
| commit | d83561a4d67863b4aa297e8f598823dd4dfe855e (patch) | |
| tree | d5c71904c838339ce0a36b408af6f1c51f58c5d8 /drivers/net | |
| parent | 1e4fd51e2c830f2a10c9b143986757d8ea35b0fc (diff) | |
| download | linux-3.10-d83561a4d67863b4aa297e8f598823dd4dfe855e.tar.gz linux-3.10-d83561a4d67863b4aa297e8f598823dd4dfe855e.tar.bz2 linux-3.10-d83561a4d67863b4aa297e8f598823dd4dfe855e.zip | |
[IRDA]: add some IBM think pads
[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
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/irda/nsc-ircc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index cc7ff8f00e4..cb62f2a9676 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c @@ -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 } }; |