diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-15 08:26:05 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-15 08:26:05 +0200 |
commit | c319c4ec062477edd0d14b79e2f3a9bd26a9a82e (patch) | |
tree | 0d8ab99d0c73413c002c1a9ef06f621014502805 /rust/kernel/device.rs | |
parent | 3b5eba544a8af6826209d34daf6197b79b1333bf (diff) | |
parent | f83ec76bf285bea5727f478a68b894f5543ca76e (diff) |
Merge 6.17-rc6 into driver-core-next
We need the driver core fixes in here to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'rust/kernel/device.rs')
-rw-r--r-- | rust/kernel/device.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 12428d00c619..c2a6f5c203f0 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -139,7 +139,9 @@ pub mod property; /// } /// ``` /// -/// An example for a class device implementation is [`drm::Device`]. +/// An example for a class device implementation is +#[cfg_attr(CONFIG_DRM = "y", doc = "[`drm::Device`](kernel::drm::Device).")] +#[cfg_attr(not(CONFIG_DRM = "y"), doc = "`drm::Device`.")] /// /// # Invariants /// @@ -152,7 +154,6 @@ pub mod property; /// dropped from any thread. /// /// [`AlwaysRefCounted`]: kernel::types::AlwaysRefCounted -/// [`drm::Device`]: kernel::drm::Device /// [`impl_device_context_deref`]: kernel::impl_device_context_deref /// [`pci::Device`]: kernel::pci::Device /// [`platform::Device`]: kernel::platform::Device |