diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:27:19 -0400 |
| commit | 39c853ebfe169f187a760b34f9cbf54751bfce00 (patch) | |
| tree | 2a5a741d0cff7d4f90998b31b32ff80cfccd0369 /drivers/net/ethernet/apple/mace.c | |
| parent | sg_start_req(): use import_iovec() (diff) | |
| parent | new helper: msg_data_left() (diff) | |
| download | linux-dev-39c853ebfe169f187a760b34f9cbf54751bfce00.tar.xz linux-dev-39c853ebfe169f187a760b34f9cbf54751bfce00.zip | |
Merge branch 'for-davem' into for-next
Diffstat (limited to 'drivers/net/ethernet/apple/mace.c')
| -rw-r--r-- | drivers/net/ethernet/apple/mace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index 842fe7684904..a18948286682 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c @@ -720,7 +720,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) mace_reset(dev); /* * XXX mace likes to hang the machine after a xmtfs error. - * This is hard to reproduce, reseting *may* help + * This is hard to reproduce, resetting *may* help */ } cp = mp->tx_cmds + NCMDS_TX * i; @@ -984,7 +984,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) return IRQ_HANDLED; } -static struct of_device_id mace_match[] = +static const struct of_device_id mace_match[] = { { .name = "mace", |