diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-06 08:41:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-06 09:46:43 -0500 |
| commit | d062c1344cefb6c368b96efea4c2a20e63657b8d (patch) | |
| tree | 56dcc373217bbcb248c35f7253c9478c1ba7e715 /include/linux/bitops.h | |
| parent | 71d3fa7efa4fc07e6f161c742397ddbe4466c631 (diff) | |
| parent | e4f8e543f1a905857a753a1d411997a81f4f52aa (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Add a new SMBIOS parser and enable it when booting from coreboot
- Fix up various driver names to avoid dtoc warnings
- Fully enable ACPI support on Google Chromebook Coral
- Add a way to set SMBIOS properties using the devicetree
- Update existing boards to use devicetree for SMBIOS using a new
default sysinfo driver
Diffstat (limited to 'include/linux/bitops.h')
| -rw-r--r-- | include/linux/bitops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 6b509dce58a..16f28993f5e 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,7 +1,7 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H -#ifndef USE_HOSTCC +#if !defined(USE_HOSTCC) && !defined(__ASSEMBLY__) #include <asm/types.h> #include <asm-generic/bitsperlong.h> @@ -218,6 +218,6 @@ static inline void generic_clear_bit(int nr, volatile unsigned long *addr) *p &= ~mask; } -#endif /* !USE_HOSTCC */ +#endif /* !USE_HOSTCC && !__ASSEMBLY__ */ #endif |