4 files changed, 1 insertions, 19 deletions

diff --git a/firmware/target/arm/pp/ascodec-target.h b/firmware/target/arm/pp/ascodec-target.h
index 68d9905a6b..e7fd1b3b35 100644
--- a/firmware/target/arm/pp/ascodec-target.h
+++ b/firmware/target/arm/pp/ascodec-target.h
@@ -27,10 +27,6 @@
 
 #include "config.h"
 
-#ifdef CPU_PP
-/* TODO: This header is actually portalplayer specific, and should be
- * moved into an appropriate subdir  */
-
 #include "as3514.h"
 #include "i2c-pp.h"
 
@@ -98,6 +94,4 @@ static inline int ascodec_read_charger(void)
 
 extern void ascodec_suppressor_on(bool on);
 
-#endif /* CPU_PP */
-
 #endif /* !_ASCODEC_TARGET_H */
diff --git a/firmware/target/arm/pp/ata-target.h b/firmware/target/arm/pp/ata-target.h
index 616c451579..b888f85b88 100644
--- a/firmware/target/arm/pp/ata-target.h
+++ b/firmware/target/arm/pp/ata-target.h
@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#ifdef CPU_PP
-
 #ifdef HAVE_BOOTLOADER_USB_MODE
 #define ATA_DRIVER_CLOSE
 #endif
@@ -57,8 +55,6 @@
 
 #endif /* CONFIG_CPU */
 
-#endif
-
 #ifdef HAVE_ATA_DMA
 
 /* IDE DMA controller registers */
diff --git a/firmware/target/arm/pp/sd-pp-target.h b/firmware/target/arm/pp/sd-pp-target.h
index 222daa1a52..342543552a 100644
--- a/firmware/target/arm/pp/sd-pp-target.h
+++ b/firmware/target/arm/pp/sd-pp-target.h
@@ -21,12 +21,8 @@
 #ifndef ATA_SD_TARGET_H
 #define ATA_SD_TARGET_H
 
-#ifdef CPU_PP   /* PortalPlayer specific functions */
-
 #ifdef HAVE_HOTSWAP
 void       microsd_int(void);
 #endif
 
 #endif
-
-#endif
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h
index e7f9ce0245..84419edd77 100644
--- a/firmware/target/arm/pp/system-target.h
+++ b/firmware/target/arm/pp/system-target.h
@@ -26,9 +26,7 @@
 #include "system-arm.h"
 #include <stdbool.h>
 
-#ifdef CPU_PP
-/* TODO: This header is actually portalplayer specific, and should be
- * moved into an appropriate subdir (or even split in 2). */
+/* TODO: This header could be split in 2 */
 
 #if CONFIG_CPU == PP5002
 #define CPUFREQ_SLEEP      32768
@@ -201,6 +199,4 @@ void system_prepare_fw_start(void);
 
 #endif /* BOOTLOADER */
 
-#endif /* CPU_PP */
-
 #endif /* SYSTEM_TARGET_H */