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
This commit is contained in:
Will Robertson 2007-09-21 15:51:53 +00:00
parent a26110c52d
commit 590501cfe4
57 changed files with 4016 additions and 17 deletions

View file

@ -45,3 +45,6 @@
#if CONFIG_CPU == DM320
#include "dm320.h"
#endif
#if CONFIG_CPU == IMX31L
#include "imx31l.h"
#endif