diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:03:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:03:38 +0800 |
| commit | 1184d6e8873282bcb4ba1d57da1cdd423a0f42d6 (patch) | |
| tree | 66bf3b45f218c738312d40e90c52f25069709892 /drivers/net/can/c_can/c_can_pci.c | |
| parent | 382ac60c32998318f133b8b84030aa83a8f600fe (diff) | |
| parent | 4e22accddef27103c4fba20b9613b7bf52129be6 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-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; |