diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-05 17:09:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-05 17:09:28 +1100 |
| commit | 549afa5723bc239db7eeb65aa3bb5501a2d37578 (patch) | |
| tree | 072b527a704984b4a0fa28fcf6873ddd1193e4ea /drivers/staging | |
| parent | cbf9353bef2843b80f7685745c756e85f68997f6 (diff) | |
| parent | 3adb180e7e6d90dd486f13c02c378956053be8dc (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/asus_oled/asus_oled.c | 13 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c index 43c57b7688ab..34a1f5fd7da5 100644 --- a/drivers/staging/asus_oled/asus_oled.c +++ b/drivers/staging/asus_oled/asus_oled.c @@ -759,13 +759,8 @@ static struct usb_driver oled_driver = { .id_table = id_table, }; -static ssize_t version_show(struct class *dev, char *buf) -{ - return sprintf(buf, ASUS_OLED_UNDERSCORE_NAME " %s\n", - ASUS_OLED_VERSION); -} - -static CLASS_ATTR(version, S_IRUGO, version_show, NULL); +static CLASS_ATTR_STRING(version, S_IRUGO, + ASUS_OLED_UNDERSCORE_NAME " " ASUS_OLED_VERSION); static int __init asus_oled_init(void) { @@ -777,7 +772,7 @@ static int __init asus_oled_init(void) return PTR_ERR(oled_class); } - retval = class_create_file(oled_class, &class_attr_version); + retval = class_create_file(oled_class, &class_attr_version.attr); if (retval) { err("Error creating class version file"); goto error; @@ -799,7 +794,7 @@ error: static void __exit asus_oled_exit(void) { - class_remove_file(oled_class, &class_attr_version); + class_remove_file(oled_class, &class_attr_version.attr); class_destroy(oled_class); usb_deregister(&oled_driver); diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 3325f24448b5..c144314e973f 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -48,6 +48,7 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308 */ #include "../comedidev.h" +#include <linux/semaphore.h> #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> |