Index: firmware/system.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/system.h,v
retrieving revision 1.14
diff -r1.14 system.h
26c26
< #ifdef ARCHOS_RECORDER
---
> #if defined(ARCHOS_RECORDER) || defined(ARCHOS_FMRECORDER)
Index: firmware/usb.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/usb.c,v
retrieving revision 1.22
diff -r1.22 usb.c
218c218
< #ifdef ARCHOS_RECORDER
---
> #if defined(ARCHOS_RECORDER)
220,221c220
< #else
< #ifdef ARCHOS_FMRECORDER
---
> #elif defined(ARCHOS_FMRECORDER)
225d223
< #endif
Index: firmware/drivers/adc.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/adc.h,v
retrieving revision 1.5
diff -r1.5 adc.h
41c41
< #ifdef ARCHOS_RECORDER
---
> #if defined(ARCHOS_RECORDER) || defined(ARCHOS_FMRECORDER)
Index: firmware/drivers/i2c.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/i2c.c,v
retrieving revision 1.5
diff -r1.5 i2c.c
127c127
< #ifndef ARCHOS_RECORDER
---
> #if !defined(ARCHOS_RECORDER) && !defined(ARCHOS_FMRECORDER)
170c170
< #ifndef ARCHOS_RECORDER
---
> #if !defined(ARCHOS_RECORDER) && !defined(ARCHOS_FMRECORDER)
Index: firmware/drivers/mas.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/mas.h,v
retrieving revision 1.13
diff -r1.13 mas.h
30c30
< #ifdef ARCHOS_RECORDER
---
> #if defined(ARCHOS_RECORDER) && defined(ARCHOS_RECORDER)
Index: firmware/drivers/power.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/power.c,v
retrieving revision 1.11
diff -r1.11 power.c
62c62
< #ifdef ARCHOS_RECORDER
---
> #if defined(ARCHOS_RECORDER) || defined(ARCHOS_FMRECORDER)
75c75
< #ifdef ARCHOS_RECORDER
---
> #if defined(ARCHOS_RECORDER) || defined(ARCHOS_FMRECORDER)

