diff for duplicates of <5090F22F.9020509@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 91a6038..8378777 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -167,7 +167,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > - .pdc = &pdc_rx_reg, > - .mask = &ssc_rx_mask, > - } }, -> -#if NUM_SSC_DEVICES == 3 +> -#if NUM_SSC_DEVICES = 3 > - {{ > - .name = "SSC1 PCM out", > + .name = "SSC PCM out", @@ -203,7 +203,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > .dir_mask = SSC_DIR_MASK_UNUSED, > .initialized = 0, > - }, -> -#if NUM_SSC_DEVICES == 3 +> -#if NUM_SSC_DEVICES = 3 > - { > - .name = "ssc1", > - .lock = __SPIN_LOCK_UNLOCKED(ssc_info[1].lock), @@ -354,7 +354,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > .formats = ATMEL_SSC_FORMATS,}, > .ops = &atmel_ssc_dai_ops, > - }, -> -#if NUM_SSC_DEVICES == 3 +> -#if NUM_SSC_DEVICES = 3 > - { > - .name = "atmel-ssc-dai.1", > - .probe = atmel_ssc_probe, diff --git a/a/content_digest b/N1/content_digest index 2a78a63..9b3fe70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01351668420-18447-3-git-send-email-voice.shen@atmel.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [Patch v2 3/4] ASoC: atmel-ssc-dai: register platform from DAIs\0" - "Date\0Wed, 31 Oct 2012 10:41:03 +0100\0" + "Date\0Wed, 31 Oct 2012 08:41:04 +0000\0" "To\0Bo Shen <voice.shen@atmel.com>\0" "Cc\0broonie@opensource.wolfsonmicro.com" linux-arm-kernel@lists.infradead.org @@ -182,7 +182,7 @@ "> -\t.pdc\t\t= &pdc_rx_reg,\n" "> -\t.mask\t\t= &ssc_rx_mask,\n" "> -\t} },\n" - "> -#if NUM_SSC_DEVICES == 3\n" + "> -#if NUM_SSC_DEVICES = 3\n" "> -\t{{\n" "> -\t.name\t\t= \"SSC1 PCM out\",\n" "> +\t.name\t\t= \"SSC PCM out\",\n" @@ -218,7 +218,7 @@ "> \t.dir_mask\t= SSC_DIR_MASK_UNUSED,\n" "> \t.initialized\t= 0,\n" "> -\t},\n" - "> -#if NUM_SSC_DEVICES == 3\n" + "> -#if NUM_SSC_DEVICES = 3\n" "> -\t{\n" "> -\t.name\t\t= \"ssc1\",\n" "> -\t.lock\t\t= __SPIN_LOCK_UNLOCKED(ssc_info[1].lock),\n" @@ -369,7 +369,7 @@ "> \t\t\t.formats = ATMEL_SSC_FORMATS,},\n" "> \t\t.ops = &atmel_ssc_dai_ops,\n" "> -\t},\n" - "> -#if NUM_SSC_DEVICES == 3\n" + "> -#if NUM_SSC_DEVICES = 3\n" "> -\t{\n" "> -\t\t.name = \"atmel-ssc-dai.1\",\n" "> -\t\t.probe = atmel_ssc_probe,\n" @@ -559,4 +559,4 @@ "-- \n" Nicolas Ferre -35505e2e78e1ae80eb5a7c8d6c7858eac3282564cddd76253cb9f35ef6317bd8 +8a1eed3c0366d89dc2be72ca21e6b340e6094d8a4eef90dbe34fa31eee51ee33
diff --git a/a/content_digest b/N2/content_digest index 2a78a63..01b569c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,9 @@ "ref\01351668420-18447-1-git-send-email-voice.shen@atmel.com\0" "ref\01351668420-18447-3-git-send-email-voice.shen@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [Patch v2 3/4] ASoC: atmel-ssc-dai: register platform from DAIs\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[Patch v2 3/4] ASoC: atmel-ssc-dai: register platform from DAIs\0" "Date\0Wed, 31 Oct 2012 10:41:03 +0100\0" - "To\0Bo Shen <voice.shen@atmel.com>\0" - "Cc\0broonie@opensource.wolfsonmicro.com" - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - linux-sound@vger.kernel.org - alsa-devel@alsa-project.org - plagnioj@jcrosoft.com - " jm.lin@atmel.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 10/31/2012 08:26 AM, Bo Shen :\n" @@ -559,4 +552,4 @@ "-- \n" Nicolas Ferre -35505e2e78e1ae80eb5a7c8d6c7858eac3282564cddd76253cb9f35ef6317bd8 +29846dc0d49c8eccff33501bb92e0c614e8b6edb825bdd2216da8f1ac5c173f6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.