diff options
author | 2024-09-04 12:15:38 +0200 | |
---|---|---|
committer | 2024-09-04 12:15:38 +0200 | |
commit | eb876ea724835126f215c9a5bcc9e6148e2a6d15 (patch) | |
tree | 689c215270b023c2f94a6629c7f1d3ef8e49c28a /rust/macros/lib.rs | |
parent | cpu/hotplug: Provide weak fallback for arch_cpuhp_init_parallel_bringup() (diff) | |
parent | Merge tag 'ata-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux (diff) | |
download | wireguard-linux-eb876ea724835126f215c9a5bcc9e6148e2a6d15.tar.xz wireguard-linux-eb876ea724835126f215c9a5bcc9e6148e2a6d15.zip |
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
Diffstat (limited to 'rust/macros/lib.rs')
-rw-r--r-- | rust/macros/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index 159e75292970..5be0cb9db3ee 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -94,7 +94,7 @@ use proc_macro::TokenStream; /// - `license`: ASCII string literal of the license of the kernel module (required). /// - `alias`: array of ASCII string literals of the alias names of the kernel module. /// - `firmware`: array of ASCII string literals of the firmware files of -/// the kernel module. +/// the kernel module. #[proc_macro] pub fn module(ts: TokenStream) -> TokenStream { module::module(ts) |