diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-09 19:58:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-09 19:58:56 -0700 |
| commit | 9a976cc6ebc7aa38ddc3b2b83f7d788aba1285e2 (patch) | |
| tree | 80feeb8b820eea0d91d3ecd754b8047d2a4620e5 /drivers | |
| parent | 60efec8e05c9fb71841c7587c55345c4b79d1856 (diff) | |
| parent | 96ab2dec88552e888f120099b6f08f29c0b4cec8 (diff) | |
| download | history-9a976cc6ebc7aa38ddc3b2b83f7d788aba1285e2.tar.gz | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/ll_rw_blk.c | 2 | ||||
| -rw-r--r-- | drivers/net/via-rhine.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index 4d10ac66001a4d..8dc40d5d86daa8 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c @@ -2867,6 +2867,8 @@ int kblockd_schedule_work(struct work_struct *work) return queue_work(kblockd_workqueue, work); } +EXPORT_SYMBOL(kblockd_schedule_work); + void kblockd_flush(void) { flush_workqueue(kblockd_workqueue); diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 386f083f8455d0..6c92063013595a 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -748,6 +748,8 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, } #endif /* USE_MMIO */ dev->base_addr = ioaddr; + rp = netdev_priv(dev); + rp->quirks = quirks; rhine_power_init(dev); @@ -792,10 +794,8 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, dev->irq = pdev->irq; - rp = netdev_priv(dev); spin_lock_init(&rp->lock); rp->pdev = pdev; - rp->quirks = quirks; rp->mii_if.dev = dev; rp->mii_if.mdio_read = mdio_read; rp->mii_if.mdio_write = mdio_write; |