diff --git a/[refs] b/[refs] index febf0839d52c..44539ca6e811 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9192ad93033e98bf50d9ee8489b24c2d9936f8c +refs/heads/master: 79d1050813d4950335f1097a971836ed08be53b0 diff --git a/trunk/drivers/net/defxx.c b/trunk/drivers/net/defxx.c index b07613e61f53..ddc30c4bf34a 100644 --- a/trunk/drivers/net/defxx.c +++ b/trunk/drivers/net/defxx.c @@ -805,7 +805,7 @@ static void __devinit dfx_bus_init(struct net_device *dev) * Interrupts are disabled at the adapter bus-specific logic. */ -static void __devinit dfx_bus_uninit(struct net_device *dev) +static void __devexit dfx_bus_uninit(struct net_device *dev) { DFX_board_t *bp = netdev_priv(dev); struct device *bdev = bp->bus_dev;