In article <4.3.1.2.20000419104436.00baa8a0@pop.jump.net> you wrote:
> Trying to compile 2.3.99-pre5 with CONFIG_BLK_DEV_XD=y yields...
> gcc -D__KERNEL__ -I/usr/src/temp/linux/include -Wall -Wstrict-prototypes
> -O2 -fo
> mit-frame-pointer -fno-strict-aliasing -pipe -march=i586 -c -o xd.o xd.c
> xd.c:1180: conflicting types for `xd_setup'
> xd.h:106: previous declaration of `xd_setup'
[snip]
Hi,
The following patch (also in pre6-3) fixes this.
Greetings,
Arjan van de Ven
--- linux/drivers/block/xd.h.org Thu Apr 13 19:13:40 2000
+++ linux/drivers/block/xd.h Thu Apr 13 19:17:22 2000
@@ -103,9 +103,9 @@
const char *name;
} XD_SIGNATURE;
-void xd_setup (char *command,int *integers);
+int xd_setup (char *);
#ifndef MODULE
-void xd_manual_geo_init (char *command,int *integers);
+int xd_manual_geo_init (char *command);
#endif /* MODULE */
static u_char xd_detect (u_char *controller, unsigned int *address);
static u_char xd_initdrives (void (*init_drive)(u_char drive));
--- linux/drivers/block/xd.c.org Thu Apr 13 19:17:46 2000
+++ linux/drivers/block/xd.c Thu Apr 13 19:18:00 2000
@@ -1190,7 +1190,7 @@
{
int i, integers[1 + 3*XD_MAXDRIVES];
- get_options (str, ARRAY_SIZE (ints), ints);
+ get_options (str, ARRAY_SIZE (integers), integers);
if (integers[0]%3 != 0) {
printk("xd: incorrect number of parameters for xd_geo\n");
return 1;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Apr 23 2000 - 21:00:15 EST