diff options
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
| -rw-r--r-- | drivers/bluetooth/btuart_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 897c7c74ca14..c5c43594ae0e 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <asm/system.h> | 41 | #include <asm/system.h> |
| 42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
| 43 | 43 | ||
| 44 | #include <pcmcia/cs.h> | ||
| 45 | #include <pcmcia/cistpl.h> | 44 | #include <pcmcia/cistpl.h> |
| 46 | #include <pcmcia/ciscode.h> | 45 | #include <pcmcia/ciscode.h> |
| 47 | #include <pcmcia/ds.h> | 46 | #include <pcmcia/ds.h> |
| @@ -589,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link) | |||
| 589 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 588 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
| 590 | link->resource[0]->end = 8; | 589 | link->resource[0]->end = 8; |
| 591 | 590 | ||
| 592 | link->conf.Attributes = CONF_ENABLE_IRQ; | 591 | link->config_flags |= CONF_ENABLE_IRQ; |
| 593 | 592 | ||
| 594 | return btuart_config(link); | 593 | return btuart_config(link); |
| 595 | } | 594 | } |
| @@ -670,7 +669,7 @@ found_port: | |||
| 670 | if (i != 0) | 669 | if (i != 0) |
| 671 | goto failed; | 670 | goto failed; |
| 672 | 671 | ||
| 673 | i = pcmcia_request_configuration(link, &link->conf); | 672 | i = pcmcia_enable_device(link); |
| 674 | if (i != 0) | 673 | if (i != 0) |
| 675 | goto failed; | 674 | goto failed; |
| 676 | 675 | ||
