diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/s6000/s6000-i2s.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/s6000/s6000-i2s.h')
| -rw-r--r-- | sound/soc/s6000/s6000-i2s.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/s6000/s6000-i2s.h b/sound/soc/s6000/s6000-i2s.h index 2375fdfe6dba..86aa1921c89e 100644 --- a/sound/soc/s6000/s6000-i2s.h +++ b/sound/soc/s6000/s6000-i2s.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #ifndef _S6000_I2S_H | 12 | #ifndef _S6000_I2S_H |
| 13 | #define _S6000_I2S_H | 13 | #define _S6000_I2S_H |
| 14 | 14 | ||
| 15 | extern struct snd_soc_dai s6000_i2s_dai; | ||
| 16 | |||
| 17 | struct s6000_snd_platform_data { | 15 | struct s6000_snd_platform_data { |
| 18 | int lines_in; | 16 | int lines_in; |
| 19 | int lines_out; | 17 | int lines_out; |