diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/sunhme.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index c33ead3470db..9b246e44f756 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -2523,7 +2523,7 @@ static struct ethtool_ops hme_ethtool_ops = { | |||
2523 | static int hme_version_printed; | 2523 | static int hme_version_printed; |
2524 | 2524 | ||
2525 | #ifdef CONFIG_SBUS | 2525 | #ifdef CONFIG_SBUS |
2526 | void __init quattro_get_ranges(struct quattro *qp) | 2526 | void __devinit quattro_get_ranges(struct quattro *qp) |
2527 | { | 2527 | { |
2528 | struct sbus_dev *sdev = qp->quattro_dev; | 2528 | struct sbus_dev *sdev = qp->quattro_dev; |
2529 | int err; | 2529 | int err; |
@@ -2539,7 +2539,7 @@ void __init quattro_get_ranges(struct quattro *qp) | |||
2539 | qp->nranges = (err / sizeof(struct linux_prom_ranges)); | 2539 | qp->nranges = (err / sizeof(struct linux_prom_ranges)); |
2540 | } | 2540 | } |
2541 | 2541 | ||
2542 | static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp) | 2542 | static void __devinit quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp) |
2543 | { | 2543 | { |
2544 | struct sbus_dev *sdev = hp->happy_dev; | 2544 | struct sbus_dev *sdev = hp->happy_dev; |
2545 | int rng; | 2545 | int rng; |
@@ -2566,7 +2566,7 @@ static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *h | |||
2566 | * | 2566 | * |
2567 | * Return NULL on failure. | 2567 | * Return NULL on failure. |
2568 | */ | 2568 | */ |
2569 | static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev) | 2569 | static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev) |
2570 | { | 2570 | { |
2571 | struct sbus_dev *sdev; | 2571 | struct sbus_dev *sdev; |
2572 | struct quattro *qp; | 2572 | struct quattro *qp; |
@@ -2618,7 +2618,7 @@ static void __init quattro_sbus_register_irqs(void) | |||
2618 | } | 2618 | } |
2619 | } | 2619 | } |
2620 | 2620 | ||
2621 | static void __devexit quattro_sbus_free_irqs(void) | 2621 | static void quattro_sbus_free_irqs(void) |
2622 | { | 2622 | { |
2623 | struct quattro *qp; | 2623 | struct quattro *qp; |
2624 | 2624 | ||
@@ -2662,7 +2662,7 @@ static struct quattro * __init quattro_pci_find(struct pci_dev *pdev) | |||
2662 | #endif /* CONFIG_PCI */ | 2662 | #endif /* CONFIG_PCI */ |
2663 | 2663 | ||
2664 | #ifdef CONFIG_SBUS | 2664 | #ifdef CONFIG_SBUS |
2665 | static int __init happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe) | 2665 | static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe) |
2666 | { | 2666 | { |
2667 | struct device_node *dp = sdev->ofdev.node; | 2667 | struct device_node *dp = sdev->ofdev.node; |
2668 | struct quattro *qp = NULL; | 2668 | struct quattro *qp = NULL; |