diff --git a/[refs] b/[refs] index cfcc4ac42e47..e1ba8d607495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dee6515b6d12188f4b9bbe76613371f7840a8a53 +refs/heads/master: 04fed361dadb7921507a470947ac23d2f26352cf diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index 662e6a10144e..9d4f6a963936 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -393,7 +393,7 @@ extern void device_unregister(struct device * dev); extern void device_initialize(struct device * dev); extern int __must_check device_add(struct device * dev); extern void device_del(struct device * dev); -extern int __must_check device_for_each_child(struct device *, void *, +extern int device_for_each_child(struct device *, void *, int (*fn)(struct device *, void *)); extern int device_rename(struct device *dev, char *new_name);