diff --git a/[refs] b/[refs] index db4ea5c04e55..775144158cbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69116f279a9eaf4c540934269342d9149538fc79 +refs/heads/master: f17dda94d48b654c793da6632f65654476291ba5 diff --git a/trunk/drivers/staging/media/lirc/lirc_parallel.c b/trunk/drivers/staging/media/lirc/lirc_parallel.c index 792aac0a8e7b..02b07a6c1771 100644 --- a/trunk/drivers/staging/media/lirc/lirc_parallel.c +++ b/trunk/drivers/staging/media/lirc/lirc_parallel.c @@ -752,4 +752,4 @@ module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Enable debugging messages"); module_param(check_pselecd, bool, S_IRUGO | S_IWUSR); -MODULE_PARM_DESC(debug, "Check for printer (default: 0)"); +MODULE_PARM_DESC(check_pselecd, "Check for printer (default: 0)");