From 101c9e615bd62c274ffd8475cc1b5d9af760e436 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Thu, 6 Aug 2009 13:07:32 +0200 Subject: [PATCH] --- yaml --- r: 157627 b: refs/heads/master c: b7b8f9bf0cd73b90561e8123fd5ec28f4539c419 h: refs/heads/master i: 157625: 1c9ca27320ef039279c9b3c5e379b8a32ccf64d4 157623: 152f1616bd2b01bb0090f096dd42b65833bcef5a v: v3 --- [refs] | 2 +- trunk/include/linux/tty.h | 2 +- trunk/sound/soc/omap/ams-delta.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f481dc354603..2732b4347af4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06cddefc1f25b847dafe392f3d5781482b3395b5 +refs/heads/master: b7b8f9bf0cd73b90561e8123fd5ec28f4539c419 diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h index 26af9816391f..15bd3b065a9d 100644 --- a/trunk/include/linux/tty.h +++ b/trunk/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/trunk/sound/soc/omap/ams-delta.c b/trunk/sound/soc/omap/ams-delta.c index 4f35b1f18cb9..5a5166ac7279 100644 --- a/trunk/sound/soc/omap/ams-delta.c +++ b/trunk/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),