Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[linux-2.6-omap-h63xx.git] / drivers / message / i2o / device.c

diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index a7dd03e8d3321e892ec780f44991c6ddd5b5abd0..0ee4264f5db772a6cb27594b5ce51906901fe3cf 100644 (file)
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -52,7 +52,6 @@ static inline int i2o_device_issue_claim(struct i2o_device *dev, u32 cmd,
 /**
  *     i2o_device_claim - claim a device for use by an OSM
  *     @dev: I2O device to claim
- *     @drv: I2O driver which wants to claim the device
  *
  *     Do the leg work to assign a device to a given OSM. If the claim succeeds,
  *     the owner is the primary. If the attempt fails a negative errno code
@@ -80,7 +79,6 @@ int i2o_device_claim(struct i2o_device *dev)
 /**
  *     i2o_device_claim_release - release a device that the OSM is using
  *     @dev: device to release
- *     @drv: driver which claimed the device
  *
  *     Drop a claim by an OSM on a given I2O device.
  *