[2.6 patch] the scheduled 'time' option removal

[Adrian Bunk <bunk@kernel.org>]

This patch contains the scheduled removal of the 'time' option.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 Documentation/feature-removal-schedule.txt |    8 --------
 kernel/printk.c                            |   13 -------------
 2 files changed, 21 deletions(-)

c0ea16c447460698c0e85963310c38fa051f0e23 
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 20c4c8b..93aac19 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -233,10 +233,2 @@ Who:	Jean Delvare <khali@linux-fr.org>
 ---------------------------
-
-What:	'time' kernel boot parameter
-When:	January 2008
-Why:	replaced by 'printk.time=<value>' so that printk timestamps can be
-	enabled or disabled as needed
-Who:	Randy Dunlap <randy.dunlap@oracle.com>
-
----------------------------
 
diff --git a/kernel/printk.c b/kernel/printk.c
index a30fe33..296c4ea 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -560,15 +560,2 @@ static int printk_time = 0;
 module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR);
-
-static int __init printk_time_setup(char *str)
-{
-	if (*str)
-		return 0;
-	printk_time = 1;
-	printk(KERN_NOTICE "The 'time' option is deprecated and "
-		"is scheduled for removal in early 2008\n");
-	printk(KERN_NOTICE "Use 'printk.time=<value>' instead\n");
-	return 1;
-}
-
-__setup("time", printk_time_setup);