diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 19:40:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 19:40:05 -0800 |
| commit | 240d3b54e3a8a8d469f0ff6deacf52f4b751f55a (patch) | |
| tree | fda052cb167f335148028712d0c3b73fb470b562 /drivers | |
| parent | Fix filesystem capability support (diff) | |
| parent | tc35815: Use irq number for tc35815-mac platform device id (diff) | |
| download | linux-dev-240d3b54e3a8a8d469f0ff6deacf52f4b751f55a.tar.xz linux-dev-240d3b54e3a8a8d469f0ff6deacf52f4b751f55a.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
tc35815: Use irq number for tc35815-mac platform device id
[MIPS] Malta: Fix reading the PCI clock frequency on big-endian
[MIPS] SMTC: Fix build error.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tc35815.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index d887c05588d5..370d329d15d9 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -611,7 +611,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data) { struct platform_device *plat_dev = to_platform_device(dev); struct pci_dev *pci_dev = data; - unsigned int id = (pci_dev->bus->number << 8) | pci_dev->devfn; + unsigned int id = pci_dev->irq; return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id; } |