diff options
| author | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
| commit | 10d832d607c621c101922442f4771737296e1241 (patch) | |
| tree | 421229d6bb43c301bbf5eb97b11c5901aae66e08 /drivers/atm/firestream.c | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| parent | a370f60a58ec7bad7045803041524ccdc4d79c75 (diff) | |
| download | lwn-10d832d607c621c101922442f4771737296e1241.tar.gz lwn-10d832d607c621c101922442f4771737296e1241.zip | |
Merge tag 'ib-mfd-regulator-arm-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-rn5t618
Immutable branch between MFD, Regulator and ARM, due for v4.8
Diffstat (limited to 'drivers/atm/firestream.c')
| -rw-r--r-- | drivers/atm/firestream.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index a969a7e443be..85aaf2222587 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c @@ -181,13 +181,17 @@ static char *res_strings[] = { "reserved 27", "reserved 28", "reserved 29", - "reserved 30", + "reserved 30", /* FIXME: The strings between 30-40 might be wrong. */ "reassembly abort: no buffers", "receive buffer overflow", "change in GFC", "receive buffer full", "low priority discard - no receive descriptor", "low priority discard - missing end of packet", + "reserved 37", + "reserved 38", + "reserved 39", + "reseverd 40", "reserved 41", "reserved 42", "reserved 43", |