lkml.org 
[lkml]   [2001]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
SubjectRe: es1370/1371 compilation clash
From
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 | `- |
--- 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
\
 
 \ /
  Last update: 2005-03-22 12:56    [W:0.056 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site