diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-05 10:15:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-05 10:15:22 -0700 |
| commit | 893a259caa6f08477bff2bccf1df0cdff38271ac (patch) | |
| tree | 29ddc9d9f76042f33de04ab251e3c64c28398c42 /arch/microblaze/kernel/reset.c | |
| parent | 3dceb8a9a931675d5d19453306c6c76228f2b575 (diff) | |
| parent | 0d2b49479bf91c857d83608da7b64328e556dff7 (diff) | |
Merge tag 'microblaze-v6.6' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Cleanup DT headers
- Remove unused zalloc_maybe_bootmem()
- Make virt_to_pfn() a static inline
* tag 'microblaze-v6.6' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Make virt_to_pfn() a static inline
microblaze: Remove zalloc_maybe_bootmem()
microblaze: Explicitly include correct DT includes
Diffstat (limited to 'arch/microblaze/kernel/reset.c')
| -rw-r--r-- | arch/microblaze/kernel/reset.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/reset.c b/arch/microblaze/kernel/reset.c index 5f4722908164..2f66c7963084 100644 --- a/arch/microblaze/kernel/reset.c +++ b/arch/microblaze/kernel/reset.c @@ -9,7 +9,6 @@ #include <linux/init.h> #include <linux/delay.h> -#include <linux/of_platform.h> #include <linux/reboot.h> void machine_shutdown(void) |