On Mon, Nov 22, 2004 at 12:21:36AM +0000, Russell King wrote:
...
That leaves me as the sole provider of the source code, and the
code has always been in the "experimental but useful" stage. The
capture code is something which doesn't meet my standards for
mainline kernel inclusion.
...
This sounds reasonable.
Below is only the rest of my patch.
<-- snip -->
The patch below ncludes the following cleanups for
drivers/video/cyber2000fb.c:
- make some needlessly global code static
diffstat output:
drivers/video/cyber2000fb.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Signed-off-by: Adrian Bunk <redacted>
--- linux-2.6.10-rc2-mm2-full/drivers/video/cyber2000fb.c.old 2004-11-21 15:05:10.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/cyber2000fb.c 2004-11-21 15:10:01.000000000 +0100
@@ -1306,7 +1233,8 @@
* Parse Cyber2000fb options. Usage:
* video=cyber2000:font:fontname
*/
-int
+#ifndef MODULE
+static int
cyber2000fb_setup(char *options)
{
char *opt;@@ -1328,6 +1256,7 @@
}
return 0;
}
+#endif
/*
* The CyberPro chips can be placed on many different bus types.
@@ -1717,7 +1646,7 @@
*
* Tony: "module_init" is now required
*/
-int __init cyber2000fb_init(void)
+static int __init cyber2000fb_init(void)
{
int ret = -1, err;