diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 21:20:05 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 21:20:05 +0200 |
commit | db8c246937713e60b7628661ccc187eeb81f2bae (patch) | |
tree | 6351e8bca23eef40fce85396d1c6f6cfffbd4b66 /sound/soc/tegra/tegra20_i2s.h | |
parent | timer: Implement TIMER_IRQSAFE (diff) | |
parent | Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time (diff) | |
download | linux-db8c246937713e60b7628661ccc187eeb81f2bae.tar.xz linux-db8c246937713e60b7628661ccc187eeb81f2bae.zip |
Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'sound/soc/tegra/tegra20_i2s.h')
-rw-r--r-- | sound/soc/tegra/tegra20_i2s.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.h b/sound/soc/tegra/tegra20_i2s.h index a57efc6a597e..c27069d24d77 100644 --- a/sound/soc/tegra/tegra20_i2s.h +++ b/sound/soc/tegra/tegra20_i2s.h @@ -158,7 +158,6 @@ struct tegra20_i2s { struct tegra_pcm_dma_params capture_dma_data; struct tegra_pcm_dma_params playback_dma_data; struct regmap *regmap; - u32 reg_ctrl; }; #endif |