diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/pcmcia/pd6729.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/pcmcia/pd6729.c')
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 3f4364341d8d..20642f0e7bfe 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
| @@ -744,7 +744,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
| 744 | 744 | ||
| 745 | for (i = 0; i < MAX_SOCKETS; i++) { | 745 | for (i = 0; i < MAX_SOCKETS; i++) { |
| 746 | socket[i].io_base = pci_resource_start(dev, 0); | 746 | socket[i].io_base = pci_resource_start(dev, 0); |
| 747 | socket[i].socket.features |= SS_CAP_PCCARD; | 747 | socket[i].socket.features |= SS_CAP_PAGE_REGS | SS_CAP_PCCARD; |
| 748 | socket[i].socket.map_size = 0x1000; | 748 | socket[i].socket.map_size = 0x1000; |
| 749 | socket[i].socket.irq_mask = mask; | 749 | socket[i].socket.irq_mask = mask; |
| 750 | socket[i].socket.pci_irq = dev->irq; | 750 | socket[i].socket.pci_irq = dev->irq; |