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/nuc900/nuc900-audio.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/nuc900/nuc900-audio.h')
| -rw-r--r-- | sound/soc/nuc900/nuc900-audio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/nuc900/nuc900-audio.h b/sound/soc/nuc900/nuc900-audio.h index 3038f519729f..59f7e8ed1a68 100644 --- a/sound/soc/nuc900/nuc900-audio.h +++ b/sound/soc/nuc900/nuc900-audio.h | |||
| @@ -111,7 +111,5 @@ struct nuc900_audio { | |||
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | extern struct nuc900_audio *nuc900_ac97_data; | 113 | extern struct nuc900_audio *nuc900_ac97_data; |
| 114 | extern struct snd_soc_dai nuc900_ac97_dai; | ||
| 115 | extern struct snd_soc_platform nuc900_soc_platform; | ||
| 116 | 114 | ||
| 117 | #endif /*end _NUC900_AUDIO_H */ | 115 | #endif /*end _NUC900_AUDIO_H */ |