diff options
-rw-r--r-- | fs/proc/Makefile | 2 | ||||
-rw-r--r-- | fs/proc/consoles.c (renamed from fs/proc/proc_console.c) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/proc/Makefile b/fs/proc/Makefile index 288a49e098bf..df434c5f28fb 100644 --- a/fs/proc/Makefile +++ b/fs/proc/Makefile | |||
@@ -10,12 +10,12 @@ proc-$(CONFIG_MMU) := mmu.o task_mmu.o | |||
10 | proc-y += inode.o root.o base.o generic.o array.o \ | 10 | proc-y += inode.o root.o base.o generic.o array.o \ |
11 | proc_tty.o | 11 | proc_tty.o |
12 | proc-y += cmdline.o | 12 | proc-y += cmdline.o |
13 | proc-y += consoles.o | ||
13 | proc-y += cpuinfo.o | 14 | proc-y += cpuinfo.o |
14 | proc-y += devices.o | 15 | proc-y += devices.o |
15 | proc-y += interrupts.o | 16 | proc-y += interrupts.o |
16 | proc-y += loadavg.o | 17 | proc-y += loadavg.o |
17 | proc-y += meminfo.o | 18 | proc-y += meminfo.o |
18 | proc-y += proc_console.o | ||
19 | proc-y += stat.o | 19 | proc-y += stat.o |
20 | proc-y += uptime.o | 20 | proc-y += uptime.o |
21 | proc-y += version.o | 21 | proc-y += version.o |
diff --git a/fs/proc/proc_console.c b/fs/proc/consoles.c index 8a707609f528..eafc22ab1fdd 100644 --- a/fs/proc/proc_console.c +++ b/fs/proc/consoles.c | |||
@@ -106,9 +106,9 @@ static const struct file_operations proc_consoles_operations = { | |||
106 | .release = seq_release, | 106 | .release = seq_release, |
107 | }; | 107 | }; |
108 | 108 | ||
109 | static int register_proc_consoles(void) | 109 | static int __init proc_consoles_init(void) |
110 | { | 110 | { |
111 | proc_create("consoles", 0, NULL, &proc_consoles_operations); | 111 | proc_create("consoles", 0, NULL, &proc_consoles_operations); |
112 | return 0; | 112 | return 0; |
113 | } | 113 | } |
114 | module_init(register_proc_consoles); | 114 | module_init(proc_consoles_init); |