diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:45:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:45:36 +0200 |
| commit | 9b40e16ee51a0e9255cd2571c76b1c8a0b504c74 (patch) | |
| tree | fc2226242e187d1827398bd527b9a795e3458ff9 /scripts/Makefile.modpost | |
| parent | staging; wlan-ng: remove duplicate USB device ID (diff) | |
| parent | Linux 5.15-rc3 (diff) | |
Merge branch 5.15-rc3 into staging-next
We need the fixes in here, and it resolves a merge issue with
drivers/staging/r8188eu/os_dep/ioctl_linux.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/Makefile.modpost')
| -rw-r--r-- | scripts/Makefile.modpost | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index eef56d629799..48585c4d04ad 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -13,7 +13,7 @@ # Stage 2 is handled by this file and does the following # 1) Find all modules listed in modules.order # 2) modpost is then used to -# 3) create one <module>.mod.c file pr. module +# 3) create one <module>.mod.c file per module # 4) create one Module.symvers file with CRC for all exported symbols # Step 3 is used to place certain information in the module's ELF |