Title: [9262] trunk/drivers/char/bfin_ppi.c: bfin_ppi: update ioctl code to 2.6.36 changes
- Revision
- 9262
- Author
- vapier
- Date
- 2010-10-21 00:33:18 -0400 (Thu, 21 Oct 2010)
Log Message
bfin_ppi: update ioctl code to 2.6.36 changes
Modified Paths
Diff
Modified: trunk/drivers/char/bfin_ppi.c (9261 => 9262)
--- trunk/drivers/char/bfin_ppi.c 2010-10-21 04:32:58 UTC (rev 9261)
+++ trunk/drivers/char/bfin_ppi.c 2010-10-21 04:33:18 UTC (rev 9262)
@@ -455,7 +455,7 @@
*
* DESCRIPTION:
*/
-static int ppi_ioctl(struct inode *inode, struct file *filp, uint cmd, unsigned long arg)
+static long ppi_ioctl(struct file *filp, uint cmd, unsigned long arg)
{
unsigned long regdata;
unsigned long flags;
@@ -1456,7 +1456,7 @@
.owner = THIS_MODULE,
.read = ppi_read,
.write = ppi_write,
- .ioctl = ppi_ioctl,
+ .unlocked_ioctl = ppi_ioctl,
.open = ppi_open,
.release = ppi_release,
.fasync = ppi_fasync,
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
