Merge tag 'pnp-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

464fddbb · Linus Torvalds <[email protected]> · 2021-11-02 16:21:27 -07:00

Pull PNP update from Rafael Wysocki:
 "Fix a comment incorrectly marked as kernel-doc (Randy Dunlap)"

* tag 'pnp-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: system.c: unmark a comment as being kernel-doc

Commit: 464fddbba1dfbc219f1e9145127a482d2159dee5
Parents: f73cd9c9 · 47e9249a

Merge commit. Changes below are compared with the first parent: f73cd9c9.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/pnp/system.c	modified	+1	−1	View file

drivers/pnp/system.c

View file

diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 6950503..835113b 100644
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -106,7 +106,7 @@ static int __init pnp_system_init(void)
 	return pnp_register_driver(&system_pnp_driver);
 }
 
-/**
+/*
  * Reserve motherboard resources after PCI claim BARs,
  * but before PCI assign resources for uninitialized PCI devices
  */