[PATCH] Fix compilation error in SDLA drive

From: Jan Engelhardt
Date: Mon Jan 02 2006 - 16:32:14 EST


Hi,



from the other thread about Arjan's inline...

"There are also some issues in drivers/net/wan/sdla_*.c that I had to
fix before make was able to link to .tmp_vmlinux1.bin." A compile-fix is
attached, and should be merged.

~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
Patch #1: Fix missing symbol error during linking stage.

Desc: isdigit() is a macro, but because someone forgot to include
<ctype.h>, it was thought to be a function (according to C rules).
Un-static'ize sdla_intack() because it is used across two files.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxx>

diff -dpru rc7-Os/include/linux/sdladrv.h rc7-std/include/linux/sdladrv.h
--- rc7-Os/include/linux/sdladrv.h 2005-12-25 00:47:48.000000000 +0100
+++ rc7-std/include/linux/sdladrv.h 2006-01-02 15:32:12.000000000 +0100
@@ -60,6 +60,7 @@ extern int sdla_peek (sdlahw_t* hw, unsi
extern int sdla_poke (sdlahw_t* hw, unsigned long addr, void* buf,
unsigned len);
extern int sdla_exec (void* opflag);
+extern int sdla_intack (sdlahw_t *hw);

extern unsigned wanpipe_hw_probe(void);

diff -dpru rc7-Os/drivers/net/wan/sdla_fr.c rc7-std/drivers/net/wan/sdla_fr.c
--- rc7-Os/drivers/net/wan/sdla_fr.c 2005-12-25 00:47:48.000000000 +0100
+++ rc7-std/drivers/net/wan/sdla_fr.c 2006-01-02 15:29:15.000000000 +0100
@@ -170,6 +170,7 @@
#include <net/route.h> /* Dynamic Route Creation */
#include <linux/etherdevice.h> /* eth_type_trans() used for bridging */
#include <linux/random.h>
+#include <linux/ctype.h>

/****** Defines & Macros ****************************************************/

diff -dpru rc7-Os/drivers/net/wan/sdladrv.c rc7-std/drivers/net/wan/sdladrv.c
--- rc7-Os/drivers/net/wan/sdladrv.c 2005-12-25 00:47:48.000000000 +0100
+++ rc7-std/drivers/net/wan/sdladrv.c 2006-01-02 15:29:58.000000000 +0100
@@ -751,7 +751,7 @@ int sdla_intde (sdlahw_t* hw)
* Acknowledge SDLA hardware interrupt.
*/

-static int sdla_intack (sdlahw_t* hw)
+int sdla_intack (sdlahw_t* hw)
{
unsigned port = hw->port;
int tmp;
diff -dpru rc7-Os/drivers/net/wan/sdlamain.c rc7-std/drivers/net/wan/sdlamain.c
--- rc7-Os/drivers/net/wan/sdlamain.c 2005-12-25 00:47:48.000000000 +0100
+++ rc7-std/drivers/net/wan/sdlamain.c 2006-01-02 15:32:30.000000000 +0100
@@ -70,6 +70,7 @@

#include <linux/ip.h>
#include <net/route.h>
+#include <linux/sdladrv.h>

#define KMEM_SAFETYZONE 8

#<<eof>>


Jan Engelhardt
--
| Alphagate Systems, http://alphagate.hopto.org/
| jengelh's site, http://jengelh.hopto.org/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/