[2.5 patch] s|linux/malloc.h|linux/slab.h| in drivers/net/wan/pc300_tty.c

[2.5 patch] s|linux/malloc.h|linux/slab.h| in drivers/net/wan/pc300_tty.c

[Adrian Bunk]

Hi Regina,

the patch below fixes the compilation of pc300_tty.c in 2.5.13 and
2.5.13-dj2:

<--  snip  -->

gcc -D__KERNEL__ -I/home/bunk/linux/kernel-2.5/linux-2.5.13/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe
-mpreferred-stack-boundary=2 -march=k6   -nostdinc -I
/usr/lib/gcc-lib/i386-linux/2.95.4/include -DKBUILD_BASENAME=pc300_tty  -c -o pc300_tty.o pc300_tty.c
pc300_tty.c:52: linux/malloc.h: No such file or directory
pc300_tty.c: In function `cpc_tty_rx_task':
pc300_tty.c:738: warning: passing arg 2 of pointer to function discards
qualifie
rs from pointer target type
make[4]: *** [pc300_tty.o] Error 1
make[4]: Leaving directory
`/home/bunk/linux/kernel-2.5/linux-2.5.13/drivers/net
/wan'

<--  snip  -->

--- drivers/net/wan/pc300_tty.c.old	Sat May  4 17:34:14 2002
+++ drivers/net/wan/pc300_tty.c	Sat May  4 17:34:34 2002
@@ -49,7 +49,7 @@
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/if.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>


cu
Adrian

-- 

You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
								Alan Cox

Re: [2.5 patch] s|linux/malloc.h|linux/slab.h| in drivers/net/wan/pc300_tty.c

[Jeff Garzik]

Adrian Bunk wrote:

>Hi Regina,
>
>the patch below fixes the compilation of pc300_tty.c in 2.5.13 and
>2.5.13-dj2:
>


I'm completely amazed this slipped past me, since I did compile tests 
when I merged it.

Thanks much for the patch.

    Jeff

Re: [2.5 patch] s|linux/malloc.h|linux/slab.h| in drivers/net/wan/pc300_tty.c

[Jeff Garzik]

patch applied