CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/s3c-i2s-v2.c

-/* sound/soc/s3c24xx/s3c-i2c-v2.c
+/* sound/soc/samsung/s3c-i2c-v2.c
  *
  * ALSA Soc Audio Layer - I2S core for newer Samsung SoCs.
  *
  * Copyright (c) 2006 Wolfson Microelectronics PLC.
  *      Graeme Gregory graeme.gregory@wolfsonmicro.com
  *      linux@wolfsonmicro.com
  *
  * Copyright (c) 2008, 2007, 2004-2005 Simtec Electronics
  *      http://armlinux.simtec.co.uk/
  *      Ben Dooks <ben@simtec.co.uk>
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
 
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <sound/pcm.h>
+#include <sound/soc.h>
 #include <sound/pcm_params.h>
-#include <sound/soc.h>
 
 #include <mach/dma.h>
 
 #include "regs-i2s-v2.h"
 #include "s3c-i2s-v2.h"
-#include "s3c-dma.h"
+#include "dma.h"
 
 #undef S3C_IIS_V2_SUPPORTED
 
 #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
         || defined(CONFIG_CPU_S5PV210)
 #define S3C_IIS_V2_SUPPORTED
 #endif
 
 #ifdef CONFIG_PLAT_S3C64XX
 #define S3C_IIS_V2_SUPPORTED
@@ skipping 706 matching lines @@
                 ops->delay = s3c2412_i2s_delay;
 
         drv->suspend = s3c2412_i2s_suspend;
         drv->resume = s3c2412_i2s_resume;
 
         return snd_soc_register_dai(dev, drv);
 }
 EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai);
 
 MODULE_LICENSE("GPL");