diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 05:13:53 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 05:13:53 +0400 |
| commit | cbfef53360ea88fa7ef9f80def778fba9b05d21e (patch) | |
| tree | 9e23ee08206ec0304e25e8a93eabc2d5bcd8ae9c /drivers/isdn/hisax/icc.c | |
| parent | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| download | linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.tar.xz | |
Merge 3.15-rc6 into driver-core-next
We want the kernfs fixes in this branch as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn/hisax/icc.c')
| -rw-r--r-- | drivers/isdn/hisax/icc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c index 51dae9167238..96d1df05044f 100644 --- a/drivers/isdn/hisax/icc.c +++ b/drivers/isdn/hisax/icc.c @@ -425,7 +425,7 @@ afterXPR: if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC %02x -> MOX1", cs->dc.icc.mon_tx[cs->dc.icc.mon_txp - 1]); } - AfterMOX1: + AfterMOX1: ; #endif } } |