diff options
author | Jean Tourrilhes <jt@hpl.hp.com> | 2006-03-20 21:59:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-20 21:59:40 -0500 |
commit | 0ed79c9b7dea5cd9a55589a495cf96f00cd037d9 (patch) | |
tree | 8f4b0224cf320f5a16d354ce2a732e045de6d21a /drivers/net | |
parent | 3b99b93baba4cbf4fd3d206e65e81a070b21b560 (diff) |
[IRDA]: nsc-ircc: support for yet another Thinkpad IrDA chipset
This patch simply adds support for a variation of the nsc-ircc PC8739x
chipset, found in some IBM Thinkpad laptops.
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 81a4ccf54c57..83141a3ff546 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -90,9 +90,9 @@ static int qos_mtt_bits = 0x07; /* 1 ms or more */ | |||
90 | static int dongle_id; | 90 | static int dongle_id; |
91 | 91 | ||
92 | /* Use BIOS settions by default, but user may supply module parameters */ | 92 | /* Use BIOS settions by default, but user may supply module parameters */ |
93 | static unsigned int io[] = { ~0, ~0, ~0, ~0 }; | 93 | static unsigned int io[] = { ~0, ~0, ~0, ~0, ~0 }; |
94 | static unsigned int irq[] = { 0, 0, 0, 0 }; | 94 | static unsigned int irq[] = { 0, 0, 0, 0, 0 }; |
95 | static unsigned int dma[] = { 0, 0, 0, 0 }; | 95 | static unsigned int dma[] = { 0, 0, 0, 0, 0 }; |
96 | 96 | ||
97 | static int nsc_ircc_probe_108(nsc_chip_t *chip, chipio_t *info); | 97 | static int nsc_ircc_probe_108(nsc_chip_t *chip, chipio_t *info); |
98 | static int nsc_ircc_probe_338(nsc_chip_t *chip, chipio_t *info); | 98 | static int nsc_ircc_probe_338(nsc_chip_t *chip, chipio_t *info); |
@@ -115,10 +115,12 @@ static nsc_chip_t chips[] = { | |||
115 | /* Contributed by Jan Frey - IBM A30/A31 */ | 115 | /* Contributed by Jan Frey - IBM A30/A31 */ |
116 | { "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, | 116 | { "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, |
117 | nsc_ircc_probe_39x, nsc_ircc_init_39x }, | 117 | nsc_ircc_probe_39x, nsc_ircc_init_39x }, |
118 | { "IBM", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff, | ||
119 | nsc_ircc_probe_39x, nsc_ircc_init_39x }, | ||
118 | { NULL } | 120 | { NULL } |
119 | }; | 121 | }; |
120 | 122 | ||
121 | static struct nsc_ircc_cb *dev_self[] = { NULL, NULL, NULL, NULL }; | 123 | static struct nsc_ircc_cb *dev_self[] = { NULL, NULL, NULL, NULL, NULL }; |
122 | 124 | ||
123 | static char *dongle_types[] = { | 125 | static char *dongle_types[] = { |
124 | "Differential serial interface", | 126 | "Differential serial interface", |