Patch applies on top of previous virtual eisa bridge ->release() patch.
Otherwise one line reject.
Index: linux-2.6.0-test2-mm2/drivers/eisa/eisa-bus.c
===================================================================
RCS file: /build/cvsroot/linux-2.6.0-test2/drivers/eisa/eisa-bus.c,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 eisa-bus.c
--- linux-2.6.0-test2-mm2/drivers/eisa/eisa-bus.c 30 Jul 2003 00:06:12 -0000 1.1.1.1
+++ linux-2.6.0-test2-mm2/drivers/eisa/eisa-bus.c 3 Aug 2003 08:57:10 -0000
@@ -36,10 +36,10 @@ static struct eisa_device_info __initdat
#define EISA_MAX_FORCED_DEV 16
#define EISA_FORCED_OFFSET 2
-static int enable_dev[EISA_MAX_FORCED_DEV + EISA_FORCED_OFFSET] = { 1, EISA_MAX_FORCED_DEV, };
-static int disable_dev[EISA_MAX_FORCED_DEV + EISA_FORCED_OFFSET] = { 1, EISA_MAX_FORCED_DEV, };
+static int __initdata enable_dev[EISA_MAX_FORCED_DEV + EISA_FORCED_OFFSET] = { 1, EISA_MAX_FORCED_DEV, };
+static int __initdata disable_dev[EISA_MAX_FORCED_DEV + EISA_FORCED_OFFSET] = { 1, EISA_MAX_FORCED_DEV, };
-static int is_forced_dev (int *forced_tab,
+static int __init is_forced_dev (int *forced_tab,
struct eisa_root_device *root,
struct eisa_device *edev)
{
@@ -375,7 +375,7 @@ static struct resource eisa_root_res = {
.flags = IORESOURCE_IO,
};
-static int eisa_bus_count;
+static int __initdata eisa_bus_count;
int __init eisa_root_register (struct eisa_root_device *root)
{
Index: linux-2.6.0-test2-mm2/drivers/eisa/virtual_root.c
===================================================================
RCS file: /build/cvsroot/linux-2.6.0-test2/drivers/eisa/virtual_root.c,v
retrieving revision 1.2
diff -u -p -B -r1.2 virtual_root.c
--- linux-2.6.0-test2-mm2/drivers/eisa/virtual_root.c 3 Aug 2003 08:57:03 -0000 1.2
+++ linux-2.6.0-test2-mm2/drivers/eisa/virtual_root.c 3 Aug 2003 08:57:58 -0000
@@ -21,7 +21,7 @@
#define EISA_FORCE_PROBE_DEFAULT 0
#endif
-static int force_probe = EISA_FORCE_PROBE_DEFAULT;
+static int __initdata force_probe = EISA_FORCE_PROBE_DEFAULT;
static void virtual_eisa_release(struct device *);
/* The default EISA device parent (virtual root device).
@@ -50,7 +50,7 @@ static void virtual_eisa_release (struct
return;
}
-static int virtual_eisa_root_init (void)
+static int __init virtual_eisa_root_init (void)
{
int r;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Aug 07 2003 - 22:00:20 EST