X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fisa.c;h=685c3e591a7e1e449abe01cf920b9337940ecba4;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=54bbd9fe255cab1a6acba22a2bef1bd2d4fbe3f8;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index 54bbd9fe2..685c3e591 100644
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -3,14 +3,21 @@
  *
  *  Copyright (C) 1999 Phil Blundell
  *
+ *  ISA shared memory and I/O port support
+ */
+
+/*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
- *
- *  ISA shared memory and I/O port support, and is required to support
- *  iopl, inb, outb and friends in userspace via glibc emulation.
  */
+
+/* 
+ * Nothing about this is actually ARM specific.  One day we could move
+ * it into kernel/resource.c or some place like that.  
+ */
+
 #include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/fs.h>
@@ -20,49 +27,21 @@
 static unsigned int isa_membase, isa_portbase, isa_portshift;
 
 static ctl_table ctl_isa_vars[4] = {
-	{
-		.ctl_name	= BUS_ISA_MEM_BASE,
-		.procname	= "membase",
-		.data		= &isa_membase, 
-		.maxlen		= sizeof(isa_membase),
-		.mode		= 0444,
-		.proc_handler	= &proc_dointvec,
-	}, {
-		.ctl_name	= BUS_ISA_PORT_BASE,
-		.procname	= "portbase",
-		.data		= &isa_portbase, 
-		.maxlen		= sizeof(isa_portbase),
-		.mode		= 0444,
-		.proc_handler	= &proc_dointvec,
-	}, {
-		.ctl_name	= BUS_ISA_PORT_SHIFT,
-		.procname	= "portshift",
-		.data		= &isa_portshift, 
-		.maxlen		= sizeof(isa_portshift),
-		.mode		= 0444,
-		.proc_handler	= &proc_dointvec,
-	}, {0}
+	{BUS_ISA_MEM_BASE, "membase", &isa_membase, 
+	 sizeof(isa_membase), 0444, NULL, &proc_dointvec},
+	{BUS_ISA_PORT_BASE, "portbase", &isa_portbase, 
+	 sizeof(isa_portbase), 0444, NULL, &proc_dointvec},
+	{BUS_ISA_PORT_SHIFT, "portshift", &isa_portshift, 
+	 sizeof(isa_portshift), 0444, NULL, &proc_dointvec},
+	{0}
 };
 
 static struct ctl_table_header *isa_sysctl_header;
 
-static ctl_table ctl_isa[2] = {
-	{
-		.ctl_name	= CTL_BUS_ISA,
-		.procname	= "isa",
-		.mode		= 0555,
-		.child		= ctl_isa_vars,
-	}, {0}
-};
-
-static ctl_table ctl_bus[2] = {
-	{
-		.ctl_name	= CTL_BUS,
-		.procname	= "bus",
-		.mode		= 0555,
-		.child		= ctl_isa,
-	}, {0}
-};
+static ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars},
+			       {0}};
+static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa},
+			       {0}};
 
 void __init
 register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift)