diff options
Diffstat (limited to 'drivers/net/ethernet/ibm/emac/core.c')
-rw-r--r-- | drivers/net/ethernet/ibm/emac/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index c791ad3907b..256bdb8e199 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c | |||
@@ -2262,7 +2262,7 @@ struct emac_depentry { | |||
2262 | #define EMAC_DEP_COUNT 6 | 2262 | #define EMAC_DEP_COUNT 6 |
2263 | 2263 | ||
2264 | static int emac_check_deps(struct emac_instance *dev, | 2264 | static int emac_check_deps(struct emac_instance *dev, |
2265 | struct emac_depentry *deps) | 2265 | struct emac_depentry *deps) |
2266 | { | 2266 | { |
2267 | int i, there = 0; | 2267 | int i, there = 0; |
2268 | struct device_node *np; | 2268 | struct device_node *np; |
@@ -2314,8 +2314,8 @@ static void emac_put_deps(struct emac_instance *dev) | |||
2314 | of_dev_put(dev->tah_dev); | 2314 | of_dev_put(dev->tah_dev); |
2315 | } | 2315 | } |
2316 | 2316 | ||
2317 | static int emac_of_bus_notify(struct notifier_block *nb, | 2317 | static int emac_of_bus_notify(struct notifier_block *nb, unsigned long action, |
2318 | unsigned long action, void *data) | 2318 | void *data) |
2319 | { | 2319 | { |
2320 | /* We are only intereted in device addition */ | 2320 | /* We are only intereted in device addition */ |
2321 | if (action == BUS_NOTIFY_BOUND_DRIVER) | 2321 | if (action == BUS_NOTIFY_BOUND_DRIVER) |
@@ -2368,7 +2368,7 @@ static int emac_wait_deps(struct emac_instance *dev) | |||
2368 | } | 2368 | } |
2369 | 2369 | ||
2370 | static int emac_read_uint_prop(struct device_node *np, const char *name, | 2370 | static int emac_read_uint_prop(struct device_node *np, const char *name, |
2371 | u32 *val, int fatal) | 2371 | u32 *val, int fatal) |
2372 | { | 2372 | { |
2373 | int len; | 2373 | int len; |
2374 | const u32 *prop = of_get_property(np, name, &len); | 2374 | const u32 *prop = of_get_property(np, name, &len); |