From: Andrew Morton Date: Fri, 24 Jun 2005 05:02:26 +0000 (-0700) Subject: [PATCH] i2o build fix X-Git-Tag: v2.6.13-rc1~68^2~331 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f52bdbe9fcf2453d402376e22de1eca6dfc96890;p=linux-2.6 [PATCH] i2o build fix LD .tmp_vmlinux1 drivers/built-in.o: In function `i2o_cfg_parms': config-osm.c:(.text+0x12764a): undefined reference to `i2o_parm_issue' Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/message/i2o/core.h b/drivers/message/i2o/core.h index 49851cccc4..c5bcfd70f7 100644 --- a/drivers/message/i2o/core.h +++ b/drivers/message/i2o/core.h @@ -46,6 +46,9 @@ extern void i2o_iop_free(struct i2o_controller *); extern int i2o_iop_add(struct i2o_controller *); extern void i2o_iop_remove(struct i2o_controller *); +/* config */ +extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int); + /* control registers relative to c->base */ #define I2O_IRQ_STATUS 0x30 #define I2O_IRQ_MASK 0x34 diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c index d8d6e89a91..21f16ba3ac 100644 --- a/drivers/message/i2o/device.c +++ b/drivers/message/i2o/device.c @@ -443,7 +443,7 @@ static struct class_interface i2o_device_class_interface = { * Note that the minimum sized reslist is 8 bytes and contains * ResultCount, ErrorInfoSize, BlockStatus and BlockSize. */ -static int i2o_parm_issue(struct i2o_device *i2o_dev, int cmd, void *oplist, +int i2o_parm_issue(struct i2o_device *i2o_dev, int cmd, void *oplist, int oplen, void *reslist, int reslen) { struct i2o_message __iomem *msg; diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 8ebc86ff10..3c3a7abebb 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -36,9 +36,9 @@ #include -#define SG_TABLESIZE 30 +#include "core.h" -extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int); +#define SG_TABLESIZE 30 static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd, unsigned long arg);