Title: [9261] trunk/drivers/char/bfin_sport.c: bfin_sport: update ioctl code to 2.6.36 changes
- Revision
- 9261
- Author
- vapier
- Date
- 2010-10-21 00:32:58 -0400 (Thu, 21 Oct 2010)
Log Message
bfin_sport: update ioctl code to 2.6.36 changes
Modified Paths
Diff
Modified: trunk/drivers/char/bfin_sport.c (9260 => 9261)
--- trunk/drivers/char/bfin_sport.c 2010-10-21 04:32:31 UTC (rev 9260)
+++ trunk/drivers/char/bfin_sport.c 2010-10-21 04:32:58 UTC (rev 9261)
@@ -787,8 +787,7 @@
return count;
}
-static int sport_ioctl(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg)
+static long sport_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct sport_dev *dev = filp->private_data;
struct sport_config config;
@@ -854,7 +853,7 @@
.owner = THIS_MODULE,
.read = sport_read,
.write = sport_write,
- .ioctl = sport_ioctl,
+ .unlocked_ioctl = sport_ioctl,
.open = sport_open,
.release = sport_release,
};
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
