projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[linux-2.6-microblaze.git]
/
kernel
/
utsname_sysctl.c
diff --git
a/kernel/utsname_sysctl.c
b/kernel/utsname_sysctl.c
index
3b34b35
..
92359cc
100644
(file)
--- a/
kernel/utsname_sysctl.c
+++ b/
kernel/utsname_sysctl.c
@@
-37,7
+37,7
@@
static void put_uts(ctl_table *table, int write, void *which)
up_write(&uts_sem);
}
-#ifdef CONFIG_PROC_
FS
+#ifdef CONFIG_PROC_
SYSCTL
/*
* Special case of dostring for the UTS structure. This has locks
* to observe. Should this be in kernel/sys.c ????