This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / input / serio / serio.c

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index deb6014..268ca1d 100644 (file)
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -246,6 +246,11 @@ static ssize_t serio_show_description(struct device *dev, char *buf)
        return sprintf(buf, "%s\n", serio->name);
 }
 
+static ssize_t serio_show_driver(struct device *dev, char *buf)
+{
+       return sprintf(buf, "%s\n", dev->driver ? dev->driver->name : "(none)");
+}
+
 static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count)
 {
        struct serio *serio = to_serio_port(dev);
@@ -302,7 +307,7 @@ static ssize_t serio_set_bind_mode(struct device *dev, const char *buf, size_t c
 
 static struct device_attribute serio_device_attrs[] = {
        __ATTR(description, S_IRUGO, serio_show_description, NULL),
-       __ATTR(drvctl, S_IWUSR, NULL, serio_rebind_driver),
+       __ATTR(driver, S_IWUSR | S_IRUGO, serio_show_driver, serio_rebind_driver),
        __ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode),
        __ATTR_NULL
 };