diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 19:15:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 19:15:13 +0200 |
| commit | a319a2773a13bab56a0d0b3744ba8703324313b5 (patch) | |
| tree | f02c86acabd1031439fd422a167784007e84ebb1 /drivers/net/mace.c | |
| parent | Move several *_SUPER_MAGIC symbols to include/linux/magic.h. (diff) | |
| parent | net/ieee80211: fix more crypto-related build breakage (diff) | |
| download | linux-a319a2773a13bab56a0d0b3744ba8703324313b5.tar.xz linux-a319a2773a13bab56a0d0b3744ba8703324313b5.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
net/ieee80211: fix more crypto-related build breakage
[PATCH] Spidernet: add ethtool -S (show statistics)
[NET] GT96100: Delete bitrotting ethernet driver
[PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
[PATCH] Cirrus Logic ep93xx ethernet driver
r8169: the MMIO region of the 8167 stands behin BAR#1
e1000, ixgb: Remove pointless wrappers
[PATCH] Remove powerpc specific parts of 3c509 driver
[PATCH] s2io: Switch to pci_get_device
[PATCH] gt96100: move to pci_get_device API
[PATCH] ehea: bugfix for register access functions
[PATCH] e1000 disable device on PCI error
drivers/net/phy/fixed: #if 0 some incomplete code
drivers/net: const-ify ethtool_ops declarations
[PATCH] ethtool: allow const ethtool_ops
[PATCH] sky2: big endian
[PATCH] sky2: fiber support
[PATCH] sky2: tx pause bug fix
drivers/net: Trim trailing whitespace
[PATCH] ehea: IBM eHEA Ethernet Device Driver
...
Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.
Diffstat (limited to 'drivers/net/mace.c')
| -rw-r--r-- | drivers/net/mace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 5d80e0e6a8e9..27c24eaa2414 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c @@ -177,7 +177,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i } mp->chipid = (in_8(&mp->mace->chipid_hi) << 8) | in_8(&mp->mace->chipid_lo); - + mp = (struct mace_data *) dev->priv; mp->maccc = ENXMT | ENRCV; @@ -219,7 +219,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i mp->port_aaui = 1; #else mp->port_aaui = 0; -#endif +#endif } } @@ -264,7 +264,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i printk(", chip revision %d.%d\n", mp->chipid >> 8, mp->chipid & 0xff); return 0; - + err_free_rx_irq: free_irq(macio_irq(mdev, 2), dev); err_free_tx_irq: @@ -1008,7 +1008,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -static struct of_device_id mace_match[] = +static struct of_device_id mace_match[] = { { .name = "mace", @@ -1017,7 +1017,7 @@ static struct of_device_id mace_match[] = }; MODULE_DEVICE_TABLE (of, mace_match); -static struct macio_driver mace_driver = +static struct macio_driver mace_driver = { .name = "mace", .match_table = mace_match, |