diff options
| author | Janusz Krzysztofik | 2009-08-06 13:07:32 +0200 |
|---|---|---|
| committer | Mark Brown | 2009-08-07 12:48:02 +0200 |
| commit | b7b8f9bf0cd73b90561e8123fd5ec28f4539c419 (patch) | |
| tree | f451730e88eabbf69c56fa2f2e422e0c45aab8b0 | |
| parent | Merge branch 'reg-cache' into for-2.6.32 (diff) | |
| download | kernel-qcow2-linux-b7b8f9bf0cd73b90561e8123fd5ec28f4539c419.tar.gz kernel-qcow2-linux-b7b8f9bf0cd73b90561e8123fd5ec28f4539c419.tar.xz kernel-qcow2-linux-b7b8f9bf0cd73b90561e8123fd5ec28f4539c419.zip | |
TTY/ASoC: Rename N_AMSDELTA line discipline to N_V253
The patch changes the line discipline name registered in include/linux/tty.h
and updates the ams-delta machine driver to use it.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | include/linux/tty.h | 2 | ||||
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 26af9816391f..15bd3b065a9d 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -47,7 +47,7 @@ #define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */ #define N_PPS 18 /* Pulse per Second */ -#define N_AMSDELTA 19 /* codec control over modem, board specific */ +#define N_V253 19 /* Codec control over voice modem */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 4f35b1f18cb9..5a5166ac7279 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -500,7 +500,7 @@ static int ams_delta_cx20442_init(struct snd_soc_codec *codec) } /* Register optional line discipline for over the modem control */ - ret = tty_register_ldisc(N_AMSDELTA, &cx81801_ops); + ret = tty_register_ldisc(N_V253, &cx81801_ops); if (ret) { dev_warn(card->dev, "Failed to register line discipline, " @@ -625,9 +625,9 @@ static void __exit ams_delta_module_exit(void) } } - if (tty_unregister_ldisc(N_AMSDELTA) != 0) + if (tty_unregister_ldisc(N_V253) != 0) dev_warn(&ams_delta_audio_platform_device->dev, - "failed to unregister AMSDELTA line discipline\n"); + "failed to unregister V253 line discipline\n"); snd_soc_jack_free_gpios(&ams_delta_hook_switch, ARRAY_SIZE(ams_delta_hook_switch_gpios), |