CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by: Bill Pemberton <[email protected]> Cc: [email protected] --- drivers/staging/octeon/ethernet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index b48196a..9276667 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -169,7 +169,7 @@ static void cvm_oct_periodic_worker(struct work_struct *work) queue_delayed_work(cvm_oct_poll_queue, &priv->port_periodic_work, HZ); } -static __devinit void cvm_oct_configure_common_hw(void) +static void cvm_oct_configure_common_hw(void) { /* Setup the FPA */ cvmx_fpa_enable(); @@ -586,7 +586,7 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = { extern void octeon_mdiobus_force_mod_depencency(void); -static struct device_node * __devinit cvm_oct_of_get_child(const struct device_node *parent, +static struct device_node *cvm_oct_of_get_child(const struct device_node *parent, int reg_val) { struct device_node *node = NULL; @@ -604,7 +604,7 @@ static struct device_node * __devinit cvm_oct_of_get_child(const struct device_n return node; } -static struct device_node * __devinit cvm_oct_node_for_port(struct device_node *pip, +static struct device_node *cvm_oct_node_for_port(struct device_node *pip, int interface, int port) { struct device_node *ni, *np; @@ -619,7 +619,7 @@ static struct device_node * __devinit cvm_oct_node_for_port(struct device_node * return np; } -static int __devinit cvm_oct_probe(struct platform_device *pdev) +static int cvm_oct_probe(struct platform_device *pdev) { int num_interfaces; int interface; -- 1.8.0 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
