* es1370/1371 compilation clash
@ 2001-07-10 9:57 Martin A. Brooks
2001-07-10 20:23 ` Alexander Griesser
0 siblings, 1 reply; 4+ messages in thread
From: Martin A. Brooks @ 2001-07-10 9:57 UTC (permalink / raw)
To: linux-kernel
Hi
I know this isn't really a valid combination however using 2.4.6ac2 and
selecting both es1370 and es1371 gives this...
ld -m elf_i386 -r -o sounddrivers.o soundcore.o es1370.o es1371.o ac97_codec.o
es1371.o: In function `gameport_register_port':
es1371.o(.text+0x587c): multiple definition of `gameport_register_port'
es1370.o(.text+0x5670): first defined here
es1371.o: In function `gameport_unregister_port':
es1371.o(.text+0x5880): multiple definition of `gameport_unregister_port'
es1370.o(.text+0x5674): first defined here
make[3]: *** [sounddrivers.o] Error 1
Arguably someone could have both chipsets in the same box, though.
Regards
Martin A. Brooks, Systems Administrator
-------------------------------------------
Hyperlink Plc t: +44 207 395 4980
57-59 Neal Street f: +44 207 395 4981
Covent Garden e: martin@hyperlink.com
London WC2H 9PJ w: http://www.hyperlink.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: es1370/1371 compilation clash
2001-07-10 9:57 es1370/1371 compilation clash Martin A. Brooks
@ 2001-07-10 20:23 ` Alexander Griesser
2001-07-10 20:38 ` Alexander Griesser
0 siblings, 1 reply; 4+ messages in thread
From: Alexander Griesser @ 2001-07-10 20:23 UTC (permalink / raw)
To: Martin A. Brooks; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
On Tue, Jul 10, 2001 at 10:57:23AM +0100, you wrote:
> I know this isn't really a valid combination however using 2.4.6ac2 and
> selecting both es1370 and es1371 gives this...
[ output snipped ]
> Arguably someone could have both chipsets in the same box, though.
You're right.
This patch should fix that.
regards, alexx
--
| .-. | CCNAIA Alexander Griesser <tuxx@aon.at> | .''`. |
| /v\ | http://www.tuxx-home.at -=- ICQ:63180135 | : :' : |
| /( )\ | echo "K..?f{1,2}e[nr]böck" >>~/.score | `. `' |
| ^^ ^^ | Linux Version 2.4.6 - Debian Unstable | `- |
[-- Attachment #2: es137x-2.4.6-ac2.diff --]
[-- Type: text/plain, Size: 1243 bytes --]
--- linux/drivers/sound/es1371.c.orig Tue Jul 10 22:16:15 2001
+++ linux/drivers/sound/es1371.c Tue Jul 10 22:18:33 2001
@@ -135,7 +135,18 @@
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
+
+/* ESS1370 and ESS1371 conflict, when both are to be comopiled */
+/* This is a small workaround for this problem */
+/* by Alexander Griesser <tuxx@aon.at> */
+#ifdef CONFIG_SOUND_ES1370
+ #define ESS137X_CONFLICT 1
+#endif
+
#include <linux/gameport.h>
+
+extern void gameport_register_port(struct gameport *gameport);¶
+extern void gameport_unregister_port(struct gameport *gameport);¶
/* --------------------------------------------------------------------- */
--- linux/include/linux/gameport.h.orig Tue Jul 10 22:16:19 2001
+++ linux/include/linux/gameport.h Tue Jul 10 22:21:25 2001
@@ -66,6 +66,8 @@
struct gameport_dev *next;
};
+#ifndef ESS137X_CONFLICT
+
int gameport_open(struct gameport *gameport, struct gameport_dev *dev, int mode);
void gameport_close(struct gameport *gameport);
void gameport_rescan(struct gameport *gameport);
@@ -137,5 +139,7 @@
current->state = TASK_UNINTERRUPTIBLE;
schedule_timeout(1 + ms * HZ / 1000);
}
+
+#endif
#endif
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: es1370/1371 compilation clash
2001-07-10 20:23 ` Alexander Griesser
@ 2001-07-10 20:38 ` Alexander Griesser
0 siblings, 0 replies; 4+ messages in thread
From: Alexander Griesser @ 2001-07-10 20:38 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
On Tue, Jul 10, 2001 at 10:23:19PM +0200, you wrote:
I'm sorry, there were 2 illegal characters in this patch (whereever they
have come from *stunning*).
This is the "fixed" one ;)
It is also available from:
http://www.tuxx-home.at/kernel-patches/
regards, alexx
--
| .-. | CCNAIA Alexander Griesser <tuxx@aon.at> | .''`. |
| /v\ | http://www.tuxx-home.at -=- ICQ:63180135 | : :' : |
| /( )\ | echo "K..?f{1,2}e[nr]böck" >>~/.score | `. `' |
| ^^ ^^ | Linux Version 2.4.6 - Debian Unstable | `- |
[-- Attachment #2: es137x-2.4.6-ac2.diff --]
[-- Type: text/plain, Size: 1241 bytes --]
--- linux/drivers/sound/es1371.c.orig Tue Jul 10 22:16:15 2001
+++ linux/drivers/sound/es1371.c Tue Jul 10 22:18:33 2001
@@ -135,7 +135,18 @@
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
+
+/* ESS1370 and ESS1371 conflict, when both are to be comopiled */
+/* This is a small workaround for this problem */
+/* by Alexander Griesser <tuxx@aon.at> */
+#ifdef CONFIG_SOUND_ES1370
+ #define ESS137X_CONFLICT 1
+#endif
+
#include <linux/gameport.h>
+
+extern void gameport_register_port(struct gameport *gameport);
+extern void gameport_unregister_port(struct gameport *gameport);
/* --------------------------------------------------------------------- */
--- linux/include/linux/gameport.h.orig Tue Jul 10 22:16:19 2001
+++ linux/include/linux/gameport.h Tue Jul 10 22:21:25 2001
@@ -66,6 +66,8 @@
struct gameport_dev *next;
};
+#ifndef ESS137X_CONFLICT
+
int gameport_open(struct gameport *gameport, struct gameport_dev *dev, int mode);
void gameport_close(struct gameport *gameport);
void gameport_rescan(struct gameport *gameport);
@@ -137,5 +139,7 @@
current->state = TASK_UNINTERRUPTIBLE;
schedule_timeout(1 + ms * HZ / 1000);
}
+
+#endif
#endif
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: es1370/1371 compilation clash
@ 2001-07-11 7:26 Martin A. Brooks
0 siblings, 0 replies; 4+ messages in thread
From: Martin A. Brooks @ 2001-07-11 7:26 UTC (permalink / raw)
To: linux-kernel
Hi Alex,
alexx wrote:
>This is the "fixed" one ;)
>It is also available from:
>http://www.tuxx-home.at/kernel-patches/
This fixes the problem for me, thanks.
Regards
Martin A. Brooks, Systems Administrator
-------------------------------------------
Hyperlink Plc t: +44 207 395 4980
57-59 Neal Street f: +44 207 395 4981
Covent Garden e: martin@hyperlink.com
London WC2H 9PJ w: http://www.hyperlink.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2001-07-11 7:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-07-10 9:57 es1370/1371 compilation clash Martin A. Brooks
2001-07-10 20:23 ` Alexander Griesser
2001-07-10 20:38 ` Alexander Griesser
2001-07-11 7:26 Martin A. Brooks
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).