linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [2.6 patch] OSS sb_card.c: no need to include mca.h
@ 2004-12-01 21:50 Adrian Bunk
  2004-12-01 23:38 ` Alan Cox
  0 siblings, 1 reply; 5+ messages in thread
From: Adrian Bunk @ 2004-12-01 21:50 UTC (permalink / raw)
  To: Paul Laufer; +Cc: linux-kernel

I didn't find any reason why this file includes mca.h .


diffstat output:
 sound/oss/sb_card.c |    3 ---
 1 files changed, 3 deletions(-)


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc2-mm4-full/sound/oss/sb_card.c.old	2004-12-01 08:17:23.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/sound/oss/sb_card.c	2004-12-01 08:17:28.000000000 +0100
@@ -26,9 +26,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#ifdef CONFIG_MCA
-#include <linux/mca.h>
-#endif /* CONFIG_MCA */
 #include "sound_config.h"
 #include "sb_mixer.h"
 #include "sb.h"


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS sb_card.c: no need to include mca.h
  2004-12-01 21:50 [2.6 patch] OSS sb_card.c: no need to include mca.h Adrian Bunk
@ 2004-12-01 23:38 ` Alan Cox
  2004-12-02  0:50   ` Adrian Bunk
  0 siblings, 1 reply; 5+ messages in thread
From: Alan Cox @ 2004-12-01 23:38 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Paul Laufer, Linux Kernel Mailing List

On Mer, 2004-12-01 at 21:50, Adrian Bunk wrote:
> I didn't find any reason why this file includes mca.h .
> 

It certainly used to need it to build MCA bus soundblaster support.
Whether it still does in 2.6 I don't know. I assume you tried an MCA
build of OSS ?


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS sb_card.c: no need to include mca.h
  2004-12-01 23:38 ` Alan Cox
@ 2004-12-02  0:50   ` Adrian Bunk
  2004-12-03  0:40     ` Paul Laufer
  0 siblings, 1 reply; 5+ messages in thread
From: Adrian Bunk @ 2004-12-02  0:50 UTC (permalink / raw)
  To: Alan Cox; +Cc: Paul Laufer, Linux Kernel Mailing List

On Wed, Dec 01, 2004 at 11:38:47PM +0000, Alan Cox wrote:
> On Mer, 2004-12-01 at 21:50, Adrian Bunk wrote:
> > I didn't find any reason why this file includes mca.h .
> > 
> 
> It certainly used to need it to build MCA bus soundblaster support.
> Whether it still does in 2.6 I don't know. I assume you tried an MCA
> build of OSS ?

Yes, I did.

And a

  grep -ri mca sound/oss/*

only found false positives (nmcard_list, numcards).

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [2.6 patch] OSS sb_card.c: no need to include mca.h
  2004-12-02  0:50   ` Adrian Bunk
@ 2004-12-03  0:40     ` Paul Laufer
  0 siblings, 0 replies; 5+ messages in thread
From: Paul Laufer @ 2004-12-03  0:40 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Alan Cox, Linux Kernel Mailing List

mca.h is not needed in sb_card.c in 2.6.

At one point I thought I would include the 2.4 MCA code in the sb_card.c
rewrite for 2.6. The file was rewritten due to the ISAPnP interface
changes that came in mid 2.5, and the ugly state of the 2.4 code. I
ended up leaving the MCA code out because I didn't have any machines to
test it on, and didn't know of anyone interested in testing it. It
should be fairly trivial to re-integrate. It was only a few tens of
lines and fairly self-contained if I recall correctly.

Note, I'm not on LKML at this time since I'm concentrating on my
Master's degree.

Also, this is the correct address to reach me at, as noted at the top of
sb_card.c. Linus rejected my CREDITS file patches the last few times I
sent them in, so the address there is invalid.

-Paul

On Thu, 2004-12-02 at 01:50 +0100, Adrian Bunk wrote:
> On Wed, Dec 01, 2004 at 11:38:47PM +0000, Alan Cox wrote:
> > On Mer, 2004-12-01 at 21:50, Adrian Bunk wrote:
> > > I didn't find any reason why this file includes mca.h .
> > > 
> > 
> > It certainly used to need it to build MCA bus soundblaster support.
> > Whether it still does in 2.6 I don't know. I assume you tried an MCA
> > build of OSS ?
> 
> Yes, I did.
> 
> And a
> 
>   grep -ri mca sound/oss/*
> 
> only found false positives (nmcard_list, numcards).
> 
> cu
> Adrian
> 
-- 
Paul Laufer <paul@laufernet.com>


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [2.6 patch] OSS sb_card.c: no need to include mca.h
@ 2005-01-25  7:48 Adrian Bunk
  0 siblings, 0 replies; 5+ messages in thread
From: Adrian Bunk @ 2005-01-25  7:48 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Paul Laufer, linux-kernel

I didn't find any reason why this file includes mca.h .
Paul Laufer already ACK'ed this patch.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch was already sent on:
- 1 Dec 2004

--- linux-2.6.10-rc2-mm4-full/sound/oss/sb_card.c.old	2004-12-01 08:17:23.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/sound/oss/sb_card.c	2004-12-01 08:17:28.000000000 +0100
@@ -26,9 +26,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#ifdef CONFIG_MCA
-#include <linux/mca.h>
-#endif /* CONFIG_MCA */
 #include "sound_config.h"
 #include "sb_mixer.h"
 #include "sb.h"


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2005-01-25  7:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-01 21:50 [2.6 patch] OSS sb_card.c: no need to include mca.h Adrian Bunk
2004-12-01 23:38 ` Alan Cox
2004-12-02  0:50   ` Adrian Bunk
2004-12-03  0:40     ` Paul Laufer
2005-01-25  7:48 Adrian Bunk

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).