diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-12 09:17:05 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-12 09:17:05 +0900 |
| commit | fdae5f37a88caed9d2105f5a1ff609322f9e5416 (patch) | |
| tree | 086808d640803b16286a318eb4d0895006de5c19 /drivers/net/can/c_can/c_can_platform.c | |
| parent | 7c5556decd0a629e9ee02e93653f75ba7b7da03c (diff) | |
| parent | b39545684a90ef3374abc0969d64c7bc540d128d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/can/c_can/c_can_platform.c')
| -rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 46a746ee80bb..b5145a7f874c 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev) break; case BOSCH_D_CAN: priv->regs = reg_map_d_can; - priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; priv->read_reg = c_can_plat_read_reg_aligned_to_16bit; priv->write_reg = c_can_plat_write_reg_aligned_to_16bit; priv->read_reg32 = d_can_plat_read_reg32; |