diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-08-11 19:34:49 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-08-11 19:34:49 -0700 |
| commit | 92807f31631ca2961fe7e98e7a7c34bbda415924 (patch) | |
| tree | f19739af72adde1400cedfe83cc9aee1005081ac /include/linux/device.h | |
| parent | 86ccb7959cf7fde613da85a6b3484a71cd24fbf9 (diff) | |
| parent | 65e5149b91c35c792e686ac2ab6a1712696f5660 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-power
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 09bad177d408..228cb79970b0 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -176,8 +176,8 @@ struct class_attribute class_attr_##_name = { \ .store = _store, \ }; -extern int class_create_file(struct class *, struct class_attribute *); -extern void class_remove_file(struct class *, struct class_attribute *); +extern int class_create_file(struct class *, const struct class_attribute *); +extern void class_remove_file(struct class *, const struct class_attribute *); struct class_device { @@ -228,8 +228,10 @@ struct class_device_attribute class_device_attr_##_name = { \ .store = _store, \ }; -extern int class_device_create_file(struct class_device *, struct class_device_attribute *); -extern void class_device_remove_file(struct class_device *, struct class_device_attribute *); +extern int class_device_create_file(struct class_device *, + const struct class_device_attribute *); +extern void class_device_remove_file(struct class_device *, + const struct class_device_attribute *); struct class_interface { |