diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:02:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:02:52 +0800 |
| commit | f83b09c3edc03ebcb59e65d6c37bc1bdb49b8210 (patch) | |
| tree | 4617c279cb52c31774284c0bde1ab4fce7efb482 /drivers/net/can/c_can/c_can_pci.c | |
| parent | c19848defd4890f84d733c14b73dcbc87ea180a4 (diff) | |
| parent | eddc563b9850ce692c6040ef0f4575aea2396d33 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rtlsk-v4.4-17.11-rt
Diffstat (limited to 'drivers/net/can/c_can/c_can_pci.c')
| -rw-r--r-- | drivers/net/can/c_can/c_can_pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c index cf7c18947189..d065c0e2d18e 100644 --- a/drivers/net/can/c_can/c_can_pci.c +++ b/drivers/net/can/c_can/c_can_pci.c @@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev, break; case BOSCH_D_CAN: priv->regs = reg_map_d_can; - priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; break; default: ret = -EINVAL; |