diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 14:54:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 14:54:05 -0800 |
| commit | f103749785a76c3e06d52fc08bdb695fbde6e042 (patch) | |
| tree | a794a2cb952ca151ab48682b50c28d7275fb419d /arch/microblaze/include | |
| parent | Merge tag 'ipe-pr-20241119' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | microblaze: mb: Use str_yes_no() helper in show_cpuinfo() (diff) | |
| download | linux-f103749785a76c3e06d52fc08bdb695fbde6e042.tar.gz linux-f103749785a76c3e06d52fc08bdb695fbde6e042.zip | |
Merge tag 'microblaze-v6.13' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Export xmb_manager functions
- Remove empty #ifndef __ASSEMBLY__ statement
- Use str_yes_no() helper in show_cpuinfo()
* tag 'microblaze-v6.13' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: mb: Use str_yes_no() helper in show_cpuinfo()
microblaze: Remove empty #ifndef __ASSEMBLY__ statement
microblaze: Export xmb_manager functions
Diffstat (limited to 'arch/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/uapi/asm/setup.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/include/uapi/asm/setup.h b/arch/microblaze/include/uapi/asm/setup.h index 6831794e6f2c..16c56807f86a 100644 --- a/arch/microblaze/include/uapi/asm/setup.h +++ b/arch/microblaze/include/uapi/asm/setup.h @@ -14,7 +14,4 @@ #define COMMAND_LINE_SIZE 256 -# ifndef __ASSEMBLY__ - -# endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */ |