summaryrefslogtreecommitdiff
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-18 12:06:17 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-18 12:06:17 +0300
commitb0fc24f36191468bcabc72aaea67ab7a2bb2a13e (patch)
treebc64adf1363a447ad4582deeaa5bb36ffcf6bfcc /include/linux/device.h
parent5821bf2dffbe18fe1f097dbb027415fa15a38e9a (diff)
parent6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff)
downloadlinux-b0fc24f36191468bcabc72aaea67ab7a2bb2a13e.tar.xz
Merge tag 'v6.10-rc4' into usb-next
We need the USB / Thunderbolt fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index fc3bd7116ab9..ace039151cb8 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1220,8 +1220,6 @@ static inline void device_remove_group(struct device *dev,
return device_remove_groups(dev, groups);
}
-int __must_check devm_device_add_groups(struct device *dev,
- const struct attribute_group **groups);
int __must_check devm_device_add_group(struct device *dev,
const struct attribute_group *grp);