2001-11-08 07:10:32

by Manik Raina

Subject: [PATCH] fix for redefinition of jedec_probe_init

On inclusion of both these files (modules disabled) the build breaks.
This is because jedec_probe_init () is defined in both these files.

I am sending a patch which makes them static. Of course, there
is another option, since both these functions are doing the same
thing, we could delete one of them.


diff -u -r /home/manik/linux/orig/linux/drivers/mtd/chips/jedec.c ./drivers/mtd/chips/jedec.c
--- /home/manik/linux/orig/linux/drivers/mtd/chips/jedec.c Fri Oct 5 03:44:59 2001
+++ ./drivers/mtd/chips/jedec.c Thu Nov 8 11:12:28 2001
@@ -873,7 +873,7 @@
}
}

-int __init jedec_probe_init(void)
+static int __init jedec_probe_init(void)
{
register_mtd_chip_driver(&jedec_chipdrv);
return 0;
diff -u -r /home/manik/linux/orig/linux/drivers/mtd/chips/jedec_probe.c ./drivers/mtd/chips/jedec_probe.c
--- /home/manik/linux/orig/linux/drivers/mtd/chips/jedec_probe.c Fri Oct 5 03:44:59 2001
+++ ./drivers/mtd/chips/jedec_probe.c Thu Nov 8 11:12:31 2001
@@ -422,7 +422,7 @@
module: THIS_MODULE
};

-int __init jedec_probe_init(void)
+static int __init jedec_probe_init(void)
{
register_mtd_chip_driver(&jedec_chipdrv);
return 0;

2001-11-08 11:29:44

by David Woodhouse

Subject: Re: [PATCH] fix for redefinition of jedec_probe_init

[email protected] said:
> I am sending a patch which makes them static. Of course, there is
> another option, since both these functions are doing the same thing,
> we could delete one of them.

A third option is to read the list archives before posting and read
what the maintainer said last time this was pointed out, only a few days
ago.


--
dwmw2