init/main.c: remove an ifdef
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 4 Jun 2014 23:12:20 +0000 (16:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2014 23:54:21 +0000 (16:54 -0700)
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/proc_fs.h
init/main.c

Simple merge
diff --cc init/main.c
Simple merge