[BUG] 2.6.0-test 9: ALPHA: missing asm/mca.h

[BUG] 2.6.0-test 9: ALPHA: missing asm/mca.h

[Thomas Steudten]

This problem ist still there in -test9..

In file included from drivers/net/3c509.c:77:
include/linux/mca.h:15:21: asm/mca.h: No such file or directory
make[2]: *** [drivers/net/3c509.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
merlin:(root):/usr/src/linux_dir/kernel2.6/linux-2.6.0-test9

-------- Original Message --------
Subject: [BUG] 2.6.0-test 7: ALPHA:  missing asm/mca.h
Date: Thu, 09 Oct 2003 12:50:39 +0200
To: LKML <linux-kernel@vger.kernel.org>

Hello

A fresh build with make O=../foo oldconfig for ALPHA CPU fails
with: (There´s no mca.h in the alpha-asm/ source tree.

LD      drivers/media/dvb/ttusb-budget/built-in.o
    LD      drivers/media/dvb/ttusb-dec/built-in.o
    LD      drivers/media/dvb/built-in.o
    LD      drivers/media/radio/built-in.o
    LD      drivers/media/video/built-in.o
    LD      drivers/media/built-in.o
    LD      drivers/misc/built-in.o
    CC      drivers/net/3c59x.o
    CC      drivers/net/Space.o
    CC      drivers/net/net_init.o
    CC      drivers/net/loopback.o
    CC      drivers/net/3c509.o
In file included from /usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/drivers/net/3c509.c:77:
/usr/src/linux_dir/kernel2.6/linux-2.6.0-test7/include/linux/mca.h:15: asm/mca.h: No such file or directory
make[3]: *** [drivers/net/3c509.o] Error 1
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [boot] Error 2

-- 
Tom

LINUX user since kernel 0.99.x 1994.
RPM Alpha packages at http://alpha.steudten.com/packages
Want to know what S.u.S.E 1995 cdrom-set contains?

Re: [BUG] 2.6.0-test 9: ALPHA: missing asm/mca.h

[Andrew Morton]

Thomas Steudten <alpha@steudten.com> wrote:
>
> This problem ist still there in -test9..
> 
> In file included from drivers/net/3c509.c:77:
> include/linux/mca.h:15:21: asm/mca.h: No such file or directory

--- 25/drivers/net/3c509.c~3c509-mca-fix	Wed Oct 29 13:11:02 2003
+++ 25-akpm/drivers/net/3c509.c	Wed Oct 29 13:11:02 2003
@@ -74,7 +74,9 @@ static int max_interrupt_work = 10;
 
 #include <linux/config.h>
 #include <linux/module.h>
+#ifdef CONFIG_MCA
 #include <linux/mca.h>
+#endif
 #include <linux/isapnp.h>
 #include <linux/string.h>
 #include <linux/interrupt.h>

_

[BUG Missing define] 2.6.0-test 9-bk11: ALPHA: missing asm/mca.h

[Thomas Steudten]

Problem still there in -bk11. Who can fix this in the kernel
source code?

Andrew Morton wrote:

> Thomas Steudten <alpha@steudten.com> wrote:
> 
>>This problem ist still there in -test9..
>>
>>In file included from drivers/net/3c509.c:77:
>>include/linux/mca.h:15:21: asm/mca.h: No such file or directory
> 
> 
> --- 25/drivers/net/3c509.c~3c509-mca-fix	Wed Oct 29 13:11:02 2003
> +++ 25-akpm/drivers/net/3c509.c	Wed Oct 29 13:11:02 2003
> @@ -74,7 +74,9 @@ static int max_interrupt_work = 10;
>  
>  #include <linux/config.h>
>  #include <linux/module.h>
> +#ifdef CONFIG_MCA
>  #include <linux/mca.h>
> +#endif
>  #include <linux/isapnp.h>
>  #include <linux/string.h>
>  #include <linux/interrupt.h>
> 
> _

-- 
Tom

LINUX user since kernel 0.99.x 1994.
RPM Alpha packages at http://alpha.steudten.com/packages
Want to know what S.u.S.E 1995 cdrom-set contains?

Re: [BUG Missing define] 2.6.0-test 9-bk11: ALPHA: missing asm/mca.h

[Herbert Xu]

Thomas Steudten <alpha@steudten.com> wrote:
> 
> Andrew Morton wrote:
> 
>> Thomas Steudten <alpha@steudten.com> wrote:
>> 
>>>This problem ist still there in -test9..
>>>
>>>In file included from drivers/net/3c509.c:77:
>>>include/linux/mca.h:15:21: asm/mca.h: No such file or directory
>
> Problem still there in -bk11. Who can fix this in the kernel
> source code?

I don't know.  But here is a different approach which hides the
ifdef stuff in mca*.h.
-- 
Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
Email:  Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
Index: kernel-source-2.5/include/linux/mca-legacy.h
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/include/linux/mca-legacy.h,v
retrieving revision 1.1.1.3
retrieving revision 1.3
diff -u -r1.1.1.3 -r1.3
--- kernel-source-2.5/include/linux/mca-legacy.h	8 Oct 2003 19:24:51 -0000	1.1.1.3
+++ kernel-source-2.5/include/linux/mca-legacy.h	26 Oct 2003 04:50:38 -0000	1.3
@@ -7,6 +7,7 @@
 #ifndef _LINUX_MCA_LEGACY_H
 #define _LINUX_MCA_LEGACY_H
 
+#include <linux/config.h>
 #include <linux/mca.h>
 
 #warning "MCA legacy - please move your driver to the new sysfs api"
@@ -24,7 +25,7 @@
  */
 #define MCA_NOTFOUND	(-1)
 
-
+#ifdef CONFIG_MCA
 
 /* Returns the slot of the first enabled adapter matching id.  User can
  * specify a starting slot beyond zero, to deal with detecting multiple
@@ -70,3 +71,4 @@
 extern void mca_write_pos(int slot, int reg, unsigned char byte);
 
 #endif
+#endif
Index: kernel-source-2.5/include/linux/mca.h
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/include/linux/mca.h,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -r1.4 -r1.6
--- kernel-source-2.5/include/linux/mca.h	11 Oct 2003 06:29:27 -0000	1.4
+++ kernel-source-2.5/include/linux/mca.h	26 Oct 2003 04:50:38 -0000	1.6
@@ -6,6 +6,10 @@
 #ifndef _LINUX_MCA_H
 #define _LINUX_MCA_H
 
+#include <linux/config.h>
+
+#ifdef CONFIG_MCA
+
 /* FIXME: This shouldn't happen, but we need everything that previously
  * included mca.h to compile.  Take it out later when the MCA #includes
  * are sorted out */
@@ -149,4 +153,5 @@
 }
 #endif
 
+#endif /* CONFIG_MCA */
 #endif /* _LINUX_MCA_H */