diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
| commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
| tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /hdlcutil/soundmodem.h | |
| parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
| parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) | |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'hdlcutil/soundmodem.h')
| -rw-r--r-- | hdlcutil/soundmodem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hdlcutil/soundmodem.h b/hdlcutil/soundmodem.h index 10d0799..3caa850 100644 --- a/hdlcutil/soundmodem.h +++ b/hdlcutil/soundmodem.h @@ -43,7 +43,7 @@ struct sm_ioctl { int cmd; union { struct sm_config cfg; - struct sm_diag_data diag; + struct sm_diag_data diag; struct sm_mixer_data mix; struct sm_debug_data dbg; } data; |