diff options
Diffstat (limited to 'drivers/net/irda/nsc-ircc.c')
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index effc1ce8179a..18d17143537c 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -151,8 +151,8 @@ static char *dongle_types[] = { | |||
151 | static chipio_t pnp_info; | 151 | static chipio_t pnp_info; |
152 | static const struct pnp_device_id nsc_ircc_pnp_table[] = { | 152 | static const struct pnp_device_id nsc_ircc_pnp_table[] = { |
153 | { .id = "NSC6001", .driver_data = 0 }, | 153 | { .id = "NSC6001", .driver_data = 0 }, |
154 | { .id = "IBM0071", .driver_data = 0 }, | ||
155 | { .id = "HWPC224", .driver_data = 0 }, | 154 | { .id = "HWPC224", .driver_data = 0 }, |
155 | { .id = "IBM0071", .driver_data = NSC_FORCE_DONGLE_TYPE9 }, | ||
156 | { } | 156 | { } |
157 | }; | 157 | }; |
158 | 158 | ||
@@ -930,7 +930,10 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i | |||
930 | pnp_info.dma = -1; | 930 | pnp_info.dma = -1; |
931 | pnp_succeeded = 1; | 931 | pnp_succeeded = 1; |
932 | 932 | ||
933 | /* There don't seem to be any way to get the cfg_base. | 933 | if (id->driver_data & NSC_FORCE_DONGLE_TYPE9) |
934 | dongle_id = 0x9; | ||
935 | |||
936 | /* There doesn't seem to be any way of getting the cfg_base. | ||
934 | * On my box, cfg_base is in the PnP descriptor of the | 937 | * On my box, cfg_base is in the PnP descriptor of the |
935 | * motherboard. Oh well... Jean II */ | 938 | * motherboard. Oh well... Jean II */ |
936 | 939 | ||