diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-21 22:31:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-21 22:32:48 +0200 |
| commit | e0ada51db907ed2db5d46ad7ff86a8b5df68e59b (patch) | |
| tree | 858966cee69ad8a50e59c4e02dcbde6ba2916151 /net/caif/chnl_net.c | |
| parent | Merge branch 'ipv6-Another-followup-to-the-fib6_info-change' (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
| download | linux-e0ada51db907ed2db5d46ad7ff86a8b5df68e59b.tar.xz linux-e0ada51db907ed2db5d46ad7ff86a8b5df68e59b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simple overlapping changes in microchip
driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/chnl_net.c')
| -rw-r--r-- | net/caif/chnl_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 53ecda10b790..13e2ae6be620 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -174,7 +174,7 @@ static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow, flow == CAIF_CTRLCMD_DEINIT_RSP ? "CLOSE/DEINIT" : flow == CAIF_CTRLCMD_INIT_FAIL_RSP ? "OPEN_FAIL" : flow == CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND ? - "REMOTE_SHUTDOWN" : "UKNOWN CTRL COMMAND"); + "REMOTE_SHUTDOWN" : "UNKNOWN CTRL COMMAND"); |