aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/apple
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/apple')
-rw-r--r--drivers/net/ethernet/apple/bmac.c2
-rw-r--r--drivers/net/ethernet/apple/mace.c4
-rw-r--r--drivers/net/ethernet/apple/macmace.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index c0bd638f84af..a65d7a60f116 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -1621,7 +1621,7 @@ static int bmac_remove(struct macio_dev *mdev)
1621 return 0; 1621 return 0;
1622} 1622}
1623 1623
1624static struct of_device_id bmac_match[] = 1624static const struct of_device_id bmac_match[] =
1625{ 1625{
1626 { 1626 {
1627 .name = "bmac", 1627 .name = "bmac",
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index 73afe49624f2..e58a7c73766e 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)
720 mace_reset(dev); 720 mace_reset(dev);
721 /* 721 /*
722 * XXX mace likes to hang the machine after a xmtfs error. 722 * XXX mace likes to hang the machine after a xmtfs error.
723 * This is hard to reproduce, reseting *may* help 723 * This is hard to reproduce, resetting *may* help
724 */ 724 */
725 } 725 }
726 cp = mp->tx_cmds + NCMDS_TX * i; 726 cp = mp->tx_cmds + NCMDS_TX * i;
@@ -984,7 +984,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id)
984 return IRQ_HANDLED; 984 return IRQ_HANDLED;
985} 985}
986 986
987static struct of_device_id mace_match[] = 987static const struct of_device_id mace_match[] =
988{ 988{
989 { 989 {
990 .name = "mace", 990 .name = "mace",
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index 6e66127e6abf..89914ca17a49 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -575,7 +575,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
575 mace_reset(dev); 575 mace_reset(dev);
576 /* 576 /*
577 * XXX mace likes to hang the machine after a xmtfs error. 577 * XXX mace likes to hang the machine after a xmtfs error.
578 * This is hard to reproduce, reseting *may* help 578 * This is hard to reproduce, resetting *may* help
579 */ 579 */
580 } 580 }
581 /* dma should have finished */ 581 /* dma should have finished */