Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / net / can / softing / softing_main.c

diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 50b1e0f21f1cdef01cb556181b2c1f828390521f..3a2b45601ec29d69f07ec4dab98425ebb09add15 100644 (file)
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -646,7 +646,7 @@ static const struct can_bittiming_const softing_btr_const = {
 
 
 static struct net_device *softing_netdev_create(struct softing *card,
-               uint16_t chip_id)
+                                               uint16_t chip_id)
 {
        struct net_device *netdev;
        struct softing_priv *priv;