projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rfkill-gpio-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
cris
/
kernel
/
setup.c
diff --git
a/arch/cris/kernel/setup.c
b/arch/cris/kernel/setup.c
index
32c3d24
..
905b70e
100644
(file)
--- a/
arch/cris/kernel/setup.c
+++ b/
arch/cris/kernel/setup.c
@@
-165,6
+165,7
@@
void __init setup_arch(char **cmdline_p)
strcpy(init_utsname()->machine, cris_machine_name);
}
strcpy(init_utsname()->machine, cris_machine_name);
}
+#ifdef CONFIG_PROC_FS
static void *c_start(struct seq_file *m, loff_t *pos)
{
return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;
static void *c_start(struct seq_file *m, loff_t *pos)
{
return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;
@@
-188,6
+189,7
@@
const struct seq_operations cpuinfo_op = {
.stop = c_stop,
.show = show_cpuinfo,
};
.stop = c_stop,
.show = show_cpuinfo,
};
+#endif /* CONFIG_PROC_FS */
static int __init topology_init(void)
{
static int __init topology_init(void)
{