summaryrefslogtreecommitdiff
path: root/drivers/usb/storage/sierra_ms.c
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2015-09-01 08:57:55 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-02-06 15:13:42 +0100
commit9eb7aa891101a4a09114ff3191f9877ea35eae06 (patch)
tree33826e4957f696a23f55d007d71a44490082b5bd /drivers/usb/storage/sierra_ms.c
parent4bd888a80b1d48dbd83f1cbf806e923a30051958 (diff)
can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS
In order to receive RTR frames in the non HW FIFO mode the RSS and EACEN bits of the reg_ctrl2 have to be activated. As this has no side effect in the FIFO mode, we do this unconditionally on cores with the reg_ctrl2. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/usb/storage/sierra_ms.c')
0 files changed, 0 insertions, 0 deletions
.git/diff/tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json')