On Mon, 18 Feb 2008, Randy Dunlap wrote:
> From: Randy Dunlap <[EMAIL PROTECTED]>
>
> Fix firmware_sample_firmware_class module to build without error.
> sysfs.h already has the function prototypes and has them correctly.
>
> Documentation/firmware_class/firmware_sample_firmware_class.c:37: error:
> conflicting types for 'sysfs_remove_bin_file'
> include/linux/sysfs.h:100: error: previous declaration of
> 'sysfs_remove_bin_file' was here
>
> Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
> ---
> Documentation/firmware_class/firmware_sample_firmware_class.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> ---
> linux-2625-rc2-docsrc.orig/Documentation/firmware_class/firmware_sample_firmware_class.c
> +++
> linux-2625-rc2-docsrc/Documentation/firmware_class/firmware_sample_firmware_class.c
> @@ -33,9 +33,6 @@ struct class_device_attribute *to_class_
> return container_of(_attr,struct class_device_attribute,attr);
> }
>
> -int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute *
> attr);
> -int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute *
> attr);
> -
> struct firmware_priv {
> char fw_id[FIRMWARE_NAME_MAX];
> s32 loading:2;
You'll need this as well, for the !CONFIG_SYSFS case.
Cc: Randy Dunlap <[EMAIL PROTECTED]>
Signed-off-by: David Rientjes <[EMAIL PROTECTED]>
---
include/linux/sysfs.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -169,8 +169,8 @@ static inline int sysfs_create_bin_file(struct kobject
*kobj,
return 0;
}
-static inline int sysfs_remove_bin_file(struct kobject *kobj,
- struct bin_attribute *attr)
+static inline void sysfs_remove_bin_file(struct kobject *kobj,
+ struct bin_attribute *attr)
{
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
