diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 10:03:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 10:03:28 +0200 |
| commit | e6aa42f93751e4d9ac8505b7ac57acd5506bdec9 (patch) | |
| tree | 3bdbb589c7e0abeb111cdd142f647fd21c762355 /arch/powerpc/kernel/prom_init.c | |
| parent | usb: gadget: u_ether: Remove duplicated include in u_ether.c (diff) | |
| parent | Linux 5.19-rc4 (diff) | |
| download | wireguard-linux-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.tar.xz wireguard-linux-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.zip | |
Merge 5.19-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 04694ec423f6..13d6cb188835 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2302,7 +2302,7 @@ static void __init prom_init_stdout(void) static int __init prom_find_machine_type(void) { - char compat[256]; + static char compat[256] __prombss; int len, i = 0; #ifdef CONFIG_PPC64 phandle rtas; |