Reverted r23881 mistakenly committed to branch.v3.4

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 58 insertions, 58 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 387652bb77..a1a8a9df2a 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -279,121 +279,121 @@ Lyre prototype 1*/
 
 /* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
-#include "config/archosplayer.h"
+#include "config-player.h"
 #elif defined(ARCHOS_RECORDER)
-#include "config/archosrecorder.h"
+#include "config-recorder.h"
 #elif defined(ARCHOS_FMRECORDER)
-#include "config/archosfmrecorder.h"
+#include "config-fmrecorder.h"
 #elif defined(ARCHOS_RECORDERV2)
-#include "config/archosrecorderv2.h"
+#include "config-recorderv2.h"
 #elif defined(ARCHOS_ONDIOSP)
-#include "config/archosondiosp.h"
+#include "config-ondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
-#include "config/archosondiofm.h"
+#include "config-ondiofm.h"
 #elif defined(ARCHOS_AV300)
-#include "config/archosav300.h"
+#include "config-av300.h"
 #elif defined(IRIVER_H100)
-#include "config/iriverh100.h"
+#include "config-h100.h"
 #elif defined(IRIVER_H120)
-#include "config/iriverh120.h"
+#include "config-h120.h"
 #elif defined(IRIVER_H300)
-#include "config/iriverh300.h"
+#include "config-h300.h"
 #elif defined(IAUDIO_X5)
-#include "config/iaudiox5.h"
+#include "config-iaudiox5.h"
 #elif defined(IAUDIO_M5)
-#include "config/iaudiom5.h"
+#include "config-iaudiom5.h"
 #elif defined(IAUDIO_M3)
-#include "config/iaudiom3.h"
+#include "config-iaudiom3.h"
 #elif defined(IPOD_COLOR)
-#include "config/ipodcolor.h"
+#include "config-ipodcolor.h"
 #elif defined(IPOD_NANO)
-#include "config/ipodnano1g.h"
+#include "config-ipodnano.h"
 #elif defined(IPOD_VIDEO)
-#include "config/ipodvideo.h"
+#include "config-ipodvideo.h"
 #elif defined(IPOD_1G2G)
-#include "config/ipod1g2g.h"
+#include "config-ipod1g2g.h"
 #elif defined(IPOD_3G)
-#include "config/ipod3g.h"
+#include "config-ipod3g.h"
 #elif defined(IPOD_4G)
-#include "config/ipod4g.h"
+#include "config-ipod4g.h"
 #elif defined(IPOD_NANO2G)
-#include "config/ipodnano2g.h"
+#include "config-ipodnano2g.h"
 #elif defined(IRIVER_IFP7XX)
-#include "config/iriverifp7xx.h"
+#include "config-ifp7xx.h"
 #elif defined(GIGABEAT_F)
-#include "config/gigabeatfx.h"
+#include "config-gigabeat.h"
 #elif defined(GIGABEAT_S)
-#include "config/gigabeats.h"
+#include "config-gigabeat-s.h"
 #elif defined(IPOD_MINI)
-#include "config/ipodmini1g.h"
+#include "config-ipodmini.h"
 #elif defined(IPOD_MINI2G)
-#include "config/ipodmini2g.h"
+#include "config-ipodmini2g.h"
 #elif defined(IRIVER_H10)
-#include "config/iriverh10.h"
+#include "config-h10.h"
 #elif defined(IRIVER_H10_5GB)
-#include "config/iriverh10_5gb.h"
+#include "config-h10_5gb.h"
 #elif defined(SANSA_E200)
-#include "config/sansae200.h"
+#include "config-e200.h"
 #elif defined(SANSA_C200)
-#include "config/sansac200.h"
+#include "config-c200.h"
 #elif defined(SANSA_M200)
-#include "config/sansam200.h"
+#include "config-m200.h"
 #elif defined(ELIO_TPJ1022)
-#include "config/tatungtpj1022.h"
+#include "config-tpj1022.h"
 #elif defined(MROBE_100)
-#include "config/mrobe100.h"
+#include "config-mrobe100.h"
 #elif defined(MROBE_500)
-#include "config/mrobe500.h"
+#include "config-mrobe500.h"
 #elif defined(LOGIK_DAX)
-#include "config/logikdax.h"
+#include "config-logikdax.h"
 #elif defined(IAUDIO_7)
-#include "config/iaudio7.h"
+#include "config-iaudio7.h"
 #elif defined(COWON_D2)
-#include "config/cowond2.h"
+#include "config-cowond2.h"
 #elif defined(CREATIVE_ZVM)
-#include "config/zenvisionm30gb.h"
+#include "config-creativezvm.h"
 #elif defined(CREATIVE_ZVM60GB)
-#include "config/zenvisionm60gb.h"
+#include "config-creativezvm60gb.h"
 #elif defined(CREATIVE_ZV)
-#include "config/zenvision.h"
+#include "config-creativezv.h"
 #elif defined(PHILIPS_SA9200)
-#include "config/gogearsa9200.h"
+#include "config-sa9200.h"
 #elif defined(PHILIPS_HDD1630)
-#include "config/gogearhdd1630.h"
+#include "config-hdd1630.h"
 #elif defined(SANSA_C100)
-#include "config/sansac100.h"
+#include "config-c100.h"
 #elif defined(MEIZU_M6SL)
-#include "config/meizum6sl.h"
+#include "config-meizu-m6sl.h"
 #elif defined(MEIZU_M6SP)
-#include "config/meizum6sp.h"
+#include "config-meizu-m6sp.h"
 #elif defined(MEIZU_M3)
-#include "config/meizum3.h"
+#include "config-meizu-m3.h"
 #elif defined(ONDA_VX747) || defined(ONDA_VX747P) || defined(ONDA_VX777)
-#include "config/ondavx747.h"
+#include "config-ondavx747.h"
 #elif defined(ONDA_VX767)
-#include "config/ondavx767.h"
+#include "config-ondavx767.h"
 #elif defined(SANSA_CLIP)
-#include "config/sansaclip.h"
+#include "config-clip.h"
 #elif defined(SANSA_E200V2)
-#include "config/sansae200v2.h"
+#include "config-e200v2.h"
 #elif defined(SANSA_M200V4)
-#include "config/sansam200v4.h"
+#include "config-m200v4.h"
 #elif defined(SANSA_FUZE)
-#include "config/sansafuze.h"
+#include "config-fuze.h"
 #elif defined(SANSA_C200V2)
-#include "config/sansac200v2.h"
+#include "config-c200v2.h"
 #elif defined(SANSA_VIEW)
-#include "config/view.h"
+#include "config-view.h"
 #elif defined(LYRE_PROTO1)
-#include "config/lyre_proto1.h"
+#include "config-lyre_proto1.h"
 #elif defined(SAMSUNG_YH820)
-#include "config/samsungyh820.h"
+#include "config-yh820.h"
 #elif defined(SAMSUNG_YH920)
-#include "config/samsungyh920.h"
+#include "config-yh920.h"
 #elif defined(SAMSUNG_YH925)
-#include "config/samsungyh925.h"
+#include "config-yh925.h"
 #elif defined(SAMSUNG_YPS3)
-#include "config/samsungyps3.h"
+#include "config-yps3.h"
 #else
 /* no known platform */
 #endif