diff --git a/[refs] b/[refs] index 580eaa311290..62d5056f04a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5dcd90b53d601a04482db9800336a0ccf190880 +refs/heads/master: 3b9c04106b70e46803c69d13d5da32f6129fa76d diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 6b89dd9d11b6..95b7fe17f124 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -24,6 +24,7 @@ #include #include #include +#include #include /* For in_interrupt() */ #include #include @@ -439,6 +440,7 @@ static int printk_time = 1; #else static int printk_time = 0; #endif +module_param(printk_time, int, S_IRUGO | S_IWUSR); static int __init printk_time_setup(char *str) {