diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-29 22:54:18 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-29 22:54:18 -0400 |
| commit | d21685ec258f803d3badae5eae821383a34815a9 (patch) | |
| tree | 7ab60a2a5d557a4f345b01a79ca2f877c06d9b92 /sound/soc/tegra | |
| parent | 74ab24af4fe165de5af01d0507250dd099f096b0 (diff) | |
| parent | ea02c63d57d7ec099f66ddb2942b4022e865cd5f (diff) | |
Merge branch 'for-2.6.40' into for-2.6.41
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/tegra_i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c index 4f5e2c90b020..6b817e20548c 100644 --- a/sound/soc/tegra/tegra_i2s.c +++ b/sound/soc/tegra/tegra_i2s.c | |||
| @@ -114,7 +114,7 @@ static void tegra_i2s_debug_remove(struct tegra_i2s *i2s) | |||
| 114 | debugfs_remove(i2s->debug); | 114 | debugfs_remove(i2s->debug); |
| 115 | } | 115 | } |
| 116 | #else | 116 | #else |
| 117 | static inline void tegra_i2s_debug_add(struct tegra_i2s *i2s) | 117 | static inline void tegra_i2s_debug_add(struct tegra_i2s *i2s, int id) |
| 118 | { | 118 | { |
| 119 | } | 119 | } |
| 120 | 120 | ||