aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/tty.h2
-rw-r--r--sound/soc/omap/ams-delta.c6
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 @@
47#define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */ 47#define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */
48#define N_PPS 18 /* Pulse per Second */ 48#define N_PPS 18 /* Pulse per Second */
49 49
50#define N_AMSDELTA 19 /* codec control over modem, board specific */ 50#define N_V253 19 /* Codec control over voice modem */
51 51
52/* 52/*
53 * This character is the same as _POSIX_VDISABLE: it cannot be used as 53 * 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)
500 } 500 }
501 501
502 /* Register optional line discipline for over the modem control */ 502 /* Register optional line discipline for over the modem control */
503 ret = tty_register_ldisc(N_AMSDELTA, &cx81801_ops); 503 ret = tty_register_ldisc(N_V253, &cx81801_ops);
504 if (ret) { 504 if (ret) {
505 dev_warn(card->dev, 505 dev_warn(card->dev,
506 "Failed to register line discipline, " 506 "Failed to register line discipline, "
@@ -625,9 +625,9 @@ static void __exit ams_delta_module_exit(void)
625 } 625 }
626 } 626 }
627 627
628 if (tty_unregister_ldisc(N_AMSDELTA) != 0) 628 if (tty_unregister_ldisc(N_V253) != 0)
629 dev_warn(&ams_delta_audio_platform_device->dev, 629 dev_warn(&ams_delta_audio_platform_device->dev,
630 "failed to unregister AMSDELTA line discipline\n"); 630 "failed to unregister V253 line discipline\n");
631 631
632 snd_soc_jack_free_gpios(&ams_delta_hook_switch, 632 snd_soc_jack_free_gpios(&ams_delta_hook_switch,
633 ARRAY_SIZE(ams_delta_hook_switch_gpios), 633 ARRAY_SIZE(ams_delta_hook_switch_gpios),