diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /firmware/export/audiohw.h | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/audiohw.h')
| -rw-r--r-- | firmware/export/audiohw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index df155e2256..ec0177d091 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -27,7 +27,7 @@ #include "uda1380.h" #elif defined(HAVE_WM8751) #include "wm8751.h" -#elif defined(HAVE_WM8975) +#elif defined(HAVE_WM8975) || defined(HAVE_WM8978) #include "wm8975.h" #elif defined(HAVE_WM8758) #include "wm8758.h" @@ -60,7 +60,7 @@ enum { #endif #if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)\ || defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) \ - || defined(HAVE_AS3514) + || defined(HAVE_AS3514) || defined(HAVE_WM8978) SOUND_LEFT_GAIN, SOUND_RIGHT_GAIN, SOUND_MIC_GAIN, |