7 files changed, 12 insertions, 12 deletions
diff --git a/src/cpu/samsung/s5p-common/clock.h b/src/cpu/samsung/s5p-common/clock.h
index 7b4eb89905..c0cd896b22 100644
--- a/src/cpu/samsung/s5p-common/clock.h
+++ b/src/cpu/samsung/s5p-common/clock.h
@@ -23,7 +23,7 @@
 #ifndef __ASM_ARM_ARCH_CLOCK_H_
 #define __ASM_ARM_ARCH_CLOCK_H_
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct s5pc100_clock {
 	unsigned int	apll_lock;
 	unsigned int	mpll_lock;
diff --git a/src/cpu/samsung/s5p-common/gpio.h b/src/cpu/samsung/s5p-common/gpio.h
index 2522808b96..d098bc8946 100644
--- a/src/cpu/samsung/s5p-common/gpio.h
+++ b/src/cpu/samsung/s5p-common/gpio.h
@@ -23,7 +23,7 @@
 
 #include <cpu/samsung/s5p-common/cpu.h>	/* FIXME: for S5PC110_GPIO_BASE */
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct s5p_gpio_bank {
 	unsigned int	con;
 	unsigned int	dat;
diff --git a/src/cpu/samsung/s5p-common/mmc.h b/src/cpu/samsung/s5p-common/mmc.h
index adef4ee21d..675666ca4d 100644
--- a/src/cpu/samsung/s5p-common/mmc.h
+++ b/src/cpu/samsung/s5p-common/mmc.h
@@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct s5p_mmc {
 	unsigned int	sysad;
 	unsigned short	blksize;
@@ -69,5 +69,5 @@ struct mmc_host {
 
 int s5p_mmc_init(int dev_index, int bus_width);
 
-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */
 #endif
diff --git a/src/cpu/samsung/s5p-common/pwm.h b/src/cpu/samsung/s5p-common/pwm.h
index 1ac348b36c..9d9370d4d8 100644
--- a/src/cpu/samsung/s5p-common/pwm.h
+++ b/src/cpu/samsung/s5p-common/pwm.h
@@ -42,7 +42,7 @@
 #define TCON_AUTO_RELOAD(x)	(1 << (TCON_OFFSET(x) + 3))
 #define TCON4_AUTO_RELOAD	(1 << 22)
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct s5p_timer {
 	unsigned int	tcfg0;
 	unsigned int	tcfg1;
@@ -63,7 +63,7 @@ struct s5p_timer {
 	unsigned int	tcnto4;
 	unsigned int	tintcstat;
 };
-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */
 
 /* FIXME(dhendrix): added missing prototypes... */
 int pwm_config(int pwm_id, int duty_ns, int period_ns);
diff --git a/src/cpu/samsung/s5p-common/sromc.h b/src/cpu/samsung/s5p-common/sromc.h
index 3800a8dbae..fe73b373b2 100644
--- a/src/cpu/samsung/s5p-common/sromc.h
+++ b/src/cpu/samsung/s5p-common/sromc.h
@@ -40,12 +40,12 @@
 #define SMC_BC_TACP(x) (x << 4)  /* 6clk     page mode access cycle */
 #define SMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct s5p_sromc {
 	unsigned int	bw;
 	unsigned int	bc[6];
 };
-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */
 
 /* Configure the Band Width and Bank Control Regs for required SROMC Bank */
 void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf);
diff --git a/src/cpu/samsung/s5p-common/uart.h b/src/cpu/samsung/s5p-common/uart.h
index 1c56739f72..bf396cc6e2 100644
--- a/src/cpu/samsung/s5p-common/uart.h
+++ b/src/cpu/samsung/s5p-common/uart.h
@@ -23,7 +23,7 @@
 #ifndef __ASM_ARCH_UART_H_
 #define __ASM_ARCH_UART_H_
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 /* baudrate rest value */
 union br_rest {
 	unsigned short	slot;		/* udivslot */
@@ -53,6 +53,6 @@ static inline int s5p_uart_divslot(void)
 	return 1;
 }
 
-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */
 
 #endif
diff --git a/src/cpu/samsung/s5p-common/watchdog.h b/src/cpu/samsung/s5p-common/watchdog.h
index 0f80ca5df4..8c8bf0ae92 100644
--- a/src/cpu/samsung/s5p-common/watchdog.h
+++ b/src/cpu/samsung/s5p-common/watchdog.h
@@ -42,7 +42,7 @@
 #define WTCON_RESET		(0x1 << WTCON_RESET_OFFSET)
 #define WTCON_INT		(0x1 << WTCON_INTEN_OFFSET)
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 struct s5p_watchdog {
 	unsigned int wtcon;
 	unsigned int wtdat;
@@ -53,6 +53,6 @@ struct s5p_watchdog {
 /* functions */
 void wdt_stop(void);
 void wdt_start(unsigned int timeout);
-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */
 
 #endif