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/s3c24xx/s3c-ac97.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/s3c24xx/s3c-ac97.h')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-ac97.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sound/soc/s3c24xx/s3c-ac97.h b/sound/soc/s3c24xx/s3c-ac97.h deleted file mode 100644 index 278198379def..000000000000 --- a/sound/soc/s3c24xx/s3c-ac97.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* sound/soc/s3c24xx/s3c-ac97.h | ||
| 2 | * | ||
| 3 | * ALSA SoC Audio Layer - S3C AC97 Controller driver | ||
| 4 | * Evolved from s3c2443-ac97.h | ||
| 5 | * | ||
| 6 | * Copyright (c) 2010 Samsung Electronics Co. Ltd | ||
| 7 | * Author: Jaswinder Singh <jassi.brar@samsung.com> | ||
| 8 | * Credits: Graeme Gregory, Sean Choi | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License version 2 as | ||
| 12 | * published by the Free Software Foundation. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #ifndef __S3C_AC97_H_ | ||
| 16 | #define __S3C_AC97_H_ | ||
| 17 | |||
| 18 | #define S3C_AC97_DAI_PCM 0 | ||
| 19 | #define S3C_AC97_DAI_MIC 1 | ||
| 20 | |||
| 21 | extern struct snd_soc_dai s3c_ac97_dai[]; | ||
| 22 | |||
| 23 | #endif /* __S3C_AC97_H_ */ | ||