Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3079
b: refs/heads/master
c: f52bdbe
h: refs/heads/master
i:
  3077: 157219f
  3075: 6bbb586
  3071: 13184a5
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Jun 24, 2005
1 parent 0657d3a commit 7c25d8e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 718c31831aa134a97f6fef215c208cea80a8b480
refs/heads/master: f52bdbe9fcf2453d402376e22de1eca6dfc96890
3 changes: 3 additions & 0 deletions trunk/drivers/message/i2o/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/message/i2o/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/message/i2o/i2o_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

#include <asm/uaccess.h>

#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);
Expand Down

0 comments on commit 7c25d8e

Please sign in to comment.