diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:41 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:41 +0000 |
commit | 2944c2f5d5c88d5893d6a1dad51d0768aed52d00 (patch) | |
tree | b09658ebfcbb078afe82beb6e462b3edebd03ddd /sound/soc/samsung/i2s.h | |
parent | f8843c91c60ed744cc7dd6326e44ddb91250ab35 (diff) | |
parent | 5b1d3c3472f1941ab1a78575fe9ada718a7c0c25 (diff) | |
download | talos-op-linux-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.tar.gz talos-op-linux-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.zip |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'sound/soc/samsung/i2s.h')
-rw-r--r-- | sound/soc/samsung/i2s.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h index d420a7ca56ca..7966afc934db 100644 --- a/sound/soc/samsung/i2s.h +++ b/sound/soc/samsung/i2s.h @@ -13,13 +13,6 @@ #ifndef __SND_SOC_SAMSUNG_I2S_H #define __SND_SOC_SAMSUNG_I2S_H -/* - * Maximum number of I2S blocks that any SoC can have. - * The secondary interface of a CPU dai(if there exists any), - * is indexed at [cpu-dai's ID + SAMSUNG_I2S_SECOFF] - */ -#define SAMSUNG_I2S_SECOFF 4 - #define SAMSUNG_I2S_DIV_BCLK 1 #define SAMSUNG_I2S_RCLKSRC_0 0 |