diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /drivers/net/can | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/softing/softing_main.c | 1 |
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 = { | |||
| 633 | }; | 633 | }; |
| 634 | 634 | ||
| 635 | static const struct can_bittiming_const softing_btr_const = { | 635 | static const struct can_bittiming_const softing_btr_const = { |
| 636 | .name = "softing", | ||
| 636 | .tseg1_min = 1, | 637 | .tseg1_min = 1, |
| 637 | .tseg1_max = 16, | 638 | .tseg1_max = 16, |
| 638 | .tseg2_min = 1, | 639 | .tseg2_min = 1, |