diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/net/pcmcia/smc91c92_cs.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/net/pcmcia/smc91c92_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index d29c22a80a06..5adc662c4bfb 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
| @@ -453,8 +453,7 @@ static int mhz_mfc_config(struct pcmcia_device *link) | |||
| 453 | 453 | ||
| 454 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 454 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
| 455 | link->conf.Status = CCSR_AUDIO_ENA; | 455 | link->conf.Status = CCSR_AUDIO_ENA; |
| 456 | link->irq.Attributes = | 456 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
| 457 | IRQ_TYPE_DYNAMIC_SHARING; | ||
| 458 | link->io.IOAddrLines = 16; | 457 | link->io.IOAddrLines = 16; |
| 459 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 458 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
| 460 | link->io.NumPorts2 = 8; | 459 | link->io.NumPorts2 = 8; |
| @@ -652,8 +651,7 @@ static int osi_config(struct pcmcia_device *link) | |||
| 652 | 651 | ||
| 653 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 652 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
| 654 | link->conf.Status = CCSR_AUDIO_ENA; | 653 | link->conf.Status = CCSR_AUDIO_ENA; |
| 655 | link->irq.Attributes = | 654 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
| 656 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | ||
| 657 | link->io.NumPorts1 = 64; | 655 | link->io.NumPorts1 = 64; |
| 658 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 656 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
| 659 | link->io.NumPorts2 = 8; | 657 | link->io.NumPorts2 = 8; |