From: Alexander Griesser <tuxx@aon.at>
To: "Martin A. Brooks" <martin.brooks@hyperlink.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: es1370/1371 compilation clash
Date: Tue, 10 Jul 2001 22:23:19 +0200 [thread overview]
Message-ID: <20010710222319.A8588@aon.at> (raw)
In-Reply-To: <994759043.3b4ad183f0364@extranet.jtrix.com>
In-Reply-To: <994759043.3b4ad183f0364@extranet.jtrix.com>
[-- 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
next prev parent reply other threads:[~2001-07-10 20:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-07-10 9:57 Martin A. Brooks
2001-07-10 20:23 ` Alexander Griesser [this message]
2001-07-10 20:38 ` Alexander Griesser
2001-07-11 7:26 Martin A. Brooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20010710222319.A8588@aon.at \
--to=tuxx@aon.at \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.brooks@hyperlink.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®