git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
lasat
/
sysctl.c
diff --git
a/arch/mips/lasat/sysctl.c
b/arch/mips/lasat/sysctl.c
index 14b9a28a4aec84a7d0f3c846ab65625e6cd6303e..d87ffd04cb0adfc1d10c824c1dd88c90b336c159 100644
(file)
--- a/
arch/mips/lasat/sysctl.c
+++ b/
arch/mips/lasat/sysctl.c
@@
-204,7
+204,7
@@
static ctl_table lasat_table[] = {
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_lasat_prid,
-
.
},
+
},
#ifdef CONFIG_INET
{
.procname = "ipaddr",