diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /include/sound/ad1848.h | |
| parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/sound/ad1848.h')
| -rw-r--r-- | include/sound/ad1848.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h index c8de6f83338f..b2c3f00a9b35 100644 --- a/include/sound/ad1848.h +++ b/include/sound/ad1848.h | |||
| @@ -185,7 +185,7 @@ struct ad1848_mix_elem { | |||
| 185 | int index; | 185 | int index; |
| 186 | int type; | 186 | int type; |
| 187 | unsigned long private_value; | 187 | unsigned long private_value; |
| 188 | unsigned int *tlv; | 188 | const unsigned int *tlv; |
| 189 | }; | 189 | }; |
| 190 | 190 | ||
| 191 | #define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \ | 191 | #define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \ |