From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 sound/pci/pcxhr/pcxhr.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN sound/pci/pcxhr/pcxhr.c~git-gccbug-fixup sound/pci/pcxhr/pcxhr.c
--- a/sound/pci/pcxhr/pcxhr.c~git-gccbug-fixup
+++ a/sound/pci/pcxhr/pcxhr.c
@@ -637,12 +637,8 @@ static void pcxhr_trigger_tasklet(unsign
  */
 static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
 {
-<<<<<<< HEAD/sound/pci/pcxhr/pcxhr.c
-	struct pcxhr_stream *stream;
-=======
 	struct pcxhr_stream *stream = NULL;
 	struct list_head *pos;
->>>>>>> /sound/pci/pcxhr/pcxhr.c
 	struct snd_pcm_substream *s;
 
 	switch (cmd) {
_