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/lm4857.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/lm4857.h')
| -rw-r--r-- | sound/soc/s3c24xx/lm4857.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/sound/soc/s3c24xx/lm4857.h b/sound/soc/s3c24xx/lm4857.h deleted file mode 100644 index 0cf5b7011d6f..000000000000 --- a/sound/soc/s3c24xx/lm4857.h +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * lm4857.h -- ALSA Soc Audio Layer | ||
| 3 | * | ||
| 4 | * Copyright 2007 Wolfson Microelectronics PLC. | ||
| 5 | * Author: Graeme Gregory | ||
| 6 | * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms of the GNU General Public License as published by the | ||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 11 | * option) any later version. | ||
| 12 | * | ||
| 13 | * Revision history | ||
| 14 | * 18th Jun 2007 Initial version. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #ifndef LM4857_H_ | ||
| 18 | #define LM4857_H_ | ||
| 19 | |||
| 20 | /* The register offsets in the cache array */ | ||
| 21 | #define LM4857_MVOL 0 | ||
| 22 | #define LM4857_LVOL 1 | ||
| 23 | #define LM4857_RVOL 2 | ||
| 24 | #define LM4857_CTRL 3 | ||
| 25 | |||
| 26 | /* the shifts required to set these bits */ | ||
| 27 | #define LM4857_3D 5 | ||
| 28 | #define LM4857_WAKEUP 5 | ||
| 29 | #define LM4857_EPGAIN 4 | ||
| 30 | |||
| 31 | #endif /*LM4857_H_*/ | ||
| 32 | |||