diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-01-17 11:40:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-01-17 11:40:52 -0800 |
| commit | 47ce834fbb6ce6cb9e802f651b647b8030c5fc7f (patch) | |
| tree | 1fe68bde208bd5697c323734453a001953d41a47 /arch/xtensa/include/asm/asmmacro.h | |
| parent | Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| parent | xtensa: don't produce FDPIC output with fdpic toolchain (diff) | |
| download | linux-47ce834fbb6ce6cb9e802f651b647b8030c5fc7f.tar.gz linux-47ce834fbb6ce6cb9e802f651b647b8030c5fc7f.tar.bz2 linux-47ce834fbb6ce6cb9e802f651b647b8030c5fc7f.zip | |
Merge tag 'xtensa-20240117' of https://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- small cleanups in the xtensa PCI and asmmacro code
- fix kernel build with FDPIC toolchain
* tag 'xtensa-20240117' of https://github.com/jcmvbkbc/linux-xtensa:
xtensa: don't produce FDPIC output with fdpic toolchain
xtensa: Use PCI_HEADER_TYPE_MFD instead of literal
xtensa: replace <asm-generic/export.h> with <linux/export.h>
xtensa: fix variants path in the Kconfig help
Diffstat (limited to 'arch/xtensa/include/asm/asmmacro.h')
| -rw-r--r-- | arch/xtensa/include/asm/asmmacro.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index 01bf7d9dbb19..a52d49a16ce7 100644 --- a/arch/xtensa/include/asm/asmmacro.h +++ b/arch/xtensa/include/asm/asmmacro.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_ASMMACRO_H #define _XTENSA_ASMMACRO_H -#include <asm-generic/export.h> +#include <linux/export.h> #include <asm/core.h> /* |