aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/softing/softing_main.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-10 18:54:14 -0800
committerTony Lindgren <tony@atomide.com>2011-03-10 18:54:14 -0800
commit94a06b74e724caabcf0464c81527cfbcae0c8aff (patch)
tree3570b6a627382a5eb5c8328b4959f615544d8e62 /drivers/net/can/softing/softing_main.c
parentMerge branch 'omap-l3-for-next' of git://dev.omapzoom.org/pub/scm/santosh/ker... (diff)
parentOMAP3: PM: Clear the SCTLR C bit in asm code to prevent data cache allocation (diff)
downloadlinux-94a06b74e724caabcf0464c81527cfbcae0c8aff.tar.gz
linux-94a06b74e724caabcf0464c81527cfbcae0c8aff.zip
Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'drivers/net/can/softing/softing_main.c')
-rw-r--r--drivers/net/can/softing/softing_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 5157e15e96eb..aeea9f9ff6e8 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -633,6 +633,7 @@ static const struct net_device_ops softing_netdev_ops = {
};
static const struct can_bittiming_const softing_btr_const = {
+ .name = "softing",
.tseg1_min = 1,
.tseg1_max = 16,
.tseg2_min = 1,