---

yaml --- r: 75682 b: refs/heads/master c: de195fd h: refs/heads/master v: v3
git-mirror · Jan 24, 2008 · cf62a46 · cf62a46
1 parent 4fade86
commit cf62a46
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 606 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668ebab44c7dd41e6823e6be15d8b28b87ddc0cd
+refs/heads/master: de195fd0016f9ab85f1d596dca48dade33f26d36
diff --git a/trunk/arch/ppc/kernel/ppc_htab.c b/trunk/arch/ppc/kernel/ppc_htab.c
@@ -436,6 +436,7 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
  */
 static ctl_table htab_ctl_table[]={
 	{
+		.ctl_name	= KERN_PPC_L2CR,
 		.procname	= "l2cr",
 		.mode		= 0644,
 		.proc_handler	= &proc_dol2crvec,

diff --git a/trunk/arch/sparc64/solaris/socksys.c b/trunk/arch/sparc64/solaris/socksys.c
@@ -54,7 +54,7 @@ extern void mykfree(void *);
 
 static unsigned int (*sock_poll)(struct file *, poll_table *);
 
-static const struct file_operations socksys_file_ops = {
+static struct file_operations socksys_file_ops = {
 	/* Currently empty */
 };