Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198548
b: refs/heads/master
c: ff4659c
h: refs/heads/master
v: v3
  • Loading branch information
Andrea Gelmini authored and Russell King committed May 24, 2010
1 parent a6d6797 commit 2b0a8f3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ffdfb47d7c13130db111a59a9885547333322e7
refs/heads/master: ff4659c1a7b207391a132bc3d11d007160a45147
11 changes: 7 additions & 4 deletions trunk/arch/arm/mach-shark/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,19 @@
static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
if (dev->bus->number == 0)
if (dev->devfn == 0) return 255;
else return 11;
else return 255;
if (dev->devfn == 0)
return 255;
else
return 11;
else
return 255;
}

extern void __init via82c505_preinit(void);

static struct hw_pci shark_pci __initdata = {
.setup = via82c505_setup,
.swizzle = pci_std_swizzle,
.swizzle = pci_std_swizzle,
.map_irq = shark_map_irq,
.nr_controllers = 1,
.scan = via82c505_scan_bus,
Expand Down

0 comments on commit 2b0a8f3

Please sign in to comment.