[PATCH] compilation fix for nand.c

[PATCH] compilation fix for nand.c

[Dave Jones]

nand.c uses do_softirq() without including interrupt.h.
Patch below makes things compile again.

regards,

Dave.

diff -urN --exclude-from=/home/davej/.exclude linux-test/drivers/mtd/nand/nand.c linux-dj/drivers/mtd/nand/nand.c
--- linux-test/drivers/mtd/nand/nand.c	Mon Sep 24 21:24:40 2001
+++ linux-dj/drivers/mtd/nand/nand.c	Mon Sep 24 02:36:43 2001
@@ -21,6 +21,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ids.h>
+#include <linux/interrupt.h>
 #include <asm/io.h>

 #ifdef CONFIG_MTD_NAND_ECC


-- 
| Dave Jones.        http://www.suse.de/~davej
| SuSE Labs

Re: [PATCH] compilation fix for nand.c

[David Woodhouse]

davej@suse.de said:
>  nand.c uses do_softirq() without including interrupt.h. Patch below
> makes things compile again.

Fixed in ftp.uk.linux.org:/pub/people/dwmw2/mtd/mtd-diff-against-2.4.10-v4

I haven't finished reading through that and taking compatibility cruft out 
yet, but I expect to have it split up and sent to Linus some time this week.

--
dwmw2

Re: [PATCH] compilation fix for nand.c

[Eyal Lebedinsky]

Dave Jones wrote:
> 
> nand.c uses do_softirq() without including interrupt.h.
> Patch below makes things compile again.

This is not a full solution though:

depmod: *** Unresolved symbols in
/lib/modules/2.4.10/kernel/drivers/mtd/nand/nand.o
depmod:         nand_calculate_ecc_R1f975137
depmod:         nand_correct_data_Re756919d

--
Eyal Lebedinsky (eyal@eyal.emu.id.au) <http://samba.anu.edu.au/eyal/>

Re: [PATCH] compilation fix for nand.c

[Dave Jones]

On Tue, 25 Sep 2001, Eyal Lebedinsky wrote:

> depmod: *** Unresolved symbols in
> /lib/modules/2.4.10/kernel/drivers/mtd/nand/nand.o
> depmod:         nand_calculate_ecc_R1f975137
> depmod:         nand_correct_data_Re756919d

*shrug*, I just made it get past my 'make everything build as a module'
test, but don't have hardware to test it.  Give dwmw2's patch a try
(url somewhere earlier in this thread), as that has more chance of being
complete.

regards,

Dave.

-- 
| Dave Jones.        http://www.suse.de/~davej
| SuSE Labs

Re: [PATCH] compilation fix for nand.c

[David Woodhouse]

eyal@eyal.emu.id.au said:
>  This is not a full solution though: 

This is also already fixed.

Index: drivers/mtd/nand/Config.in
===================================================================
RCS file: /inst/cvs/linux/drivers/mtd/nand/Attic/Config.in,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 Config.in
--- drivers/mtd/nand/Config.in	2001/09/19 08:35:21	1.1.2.4
+++ drivers/mtd/nand/Config.in	2001/09/25 07:52:18
@@ -1,6 +1,6 @@
 # drivers/mtd/nand/Config.in
 
-# $Id: Config.in,v 1.3 2001/07/03 17:50:56 sjhill Exp $
+# $Id: Config.in,v 1.4 2001/09/19 09:35:23 dwmw2 Exp $
 
 mainmenu_option next_comment
 
Index: drivers/mtd/nand/Makefile
===================================================================
RCS file: /inst/cvs/linux/drivers/mtd/nand/Attic/Makefile,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 Makefile
--- drivers/mtd/nand/Makefile	2001/07/03 07:56:53	1.1.2.3
+++ drivers/mtd/nand/Makefile	2001/09/25 07:52:18
@@ -1,14 +1,16 @@
 #
 # linux/drivers/nand/Makefile
 #
-# $Id: Makefile,v 1.4 2001/06/28 10:49:45 dwmw2 Exp $
+# $Id: Makefile,v 1.5 2001/09/19 22:39:59 dwmw2 Exp $
 
 O_TARGET	:= nandlink.o
 
 export-objs	:= nand.o nand_ecc.o
 
-obj-$(CONFIG_MTD_NAND)		+= nand.o
-obj-$(CONFIG_MTD_NAND_ECC)	+= nand_ecc.o
+nandobjs-y			:= nand.o
+nandobjs-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o
+
+obj-$(CONFIG_MTD_NAND)		+= $(nandobjs-y)
 obj-$(CONFIG_MTD_NAND_SPIA)	+= spia.o
 
 include $(TOPDIR)/Rules.make
Index: drivers/mtd/nand/nand.c
===================================================================
RCS file: /inst/cvs/linux/drivers/mtd/nand/Attic/nand.c,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 nand.c
--- drivers/mtd/nand/nand.c	2001/06/13 06:41:34	1.1.2.2
+++ drivers/mtd/nand/nand.c	2001/09/25 07:52:18
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2000 Steven J. Hill (sjhill@cotw.com)
  *
- * $Id: nand.c,v 1.10 2001/03/20 07:26:01 dwmw2 Exp $
+ * $Id: nand.c,v 1.11 2001/09/02 15:32:25 dwmw2 Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,6 +21,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ids.h>
+#include <linux/interrupt.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_MTD_NAND_ECC

--
dwmw2