diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-03 15:43:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-03 15:43:33 +0100 |
| commit | dbdb9a6706cb20c1119f8adf0aa95c3f5a5533a2 (patch) | |
| tree | 9878920f9fea132fa0886bbae3c46682010acf4c /include | |
| parent | 8a6aa853bf92c99b399941237f87c4c31576a0b1 (diff) | |
| parent | 5346a27fed4d8f0d781b0035ab066f6684cc641e (diff) | |
| download | linux-next-dbdb9a6706cb20c1119f8adf0aa95c3f5a5533a2.tar.gz linux-next-dbdb9a6706cb20c1119f8adf0aa95c3f5a5533a2.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_s3c.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h index 102aa33d956c..f54cb6e23f85 100644 --- a/include/linux/serial_s3c.h +++ b/include/linux/serial_s3c.h @@ -269,7 +269,7 @@ #define APPLE_S5L_UTRSTAT_RXTO BIT(9) #define APPLE_S5L_UTRSTAT_ALL_FLAGS GENMASK(9, 3) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <linux/serial_core.h> @@ -294,7 +294,7 @@ struct s3c2410_uartcfg { unsigned long ufcon; /* value of ufcon for port */ }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_ARM_REGS_SERIAL_H */ |