summaryrefslogtreecommitdiffstats
path: root/drivers/rapidio/rio-driver.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 03:43:52 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 03:43:52 +0100
commit99cd7074891f87c49660e3b2880564324a4733ac (patch)
tree903d2665bcb445f1f265d1adf7a99f265bcefc15 /drivers/rapidio/rio-driver.c
parenttrace: clean up funny line breaks in stat_seq_show (diff)
parentLinux 2.6.29-rc1 (diff)
downloadlinux-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz
linux-99cd7074891f87c49660e3b2880564324a4733ac.zip
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'drivers/rapidio/rio-driver.c')
-rw-r--r--drivers/rapidio/rio-driver.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
index 956d3e79f6aa..addb87cf44d9 100644
--- a/drivers/rapidio/rio-driver.c
+++ b/drivers/rapidio/rio-driver.c
@@ -79,7 +79,6 @@ void rio_dev_put(struct rio_dev *rdev)
/**
* rio_device_probe - Tell if a RIO device structure has a matching RIO device id structure
- * @id: the RIO device id structure to match against
* @dev: the RIO device structure to match against
*
* return 0 and set rio_dev->driver when drv claims rio_dev, else error