Mercurial > pt1
changeset 118:53266592882d
follow changes in struct file_operations. .ioctl has been removed in 2.6.36.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Thu, 18 Nov 2010 23:01:40 +0900 |
| parents | 4d42c5c28557 |
| children | 7662d0ecd74b |
| files | driver/pt1_pci.c |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/driver/pt1_pci.c Thu May 20 13:51:09 2010 +0900 +++ b/driver/pt1_pci.c Thu Nov 18 23:01:40 2010 +0900 @@ -511,7 +511,11 @@ return count; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +static long pt1_ioctl(struct file *file, unsigned int cmd, unsigned long arg0) +#else static int pt1_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg0) +#endif { PT1_CHANNEL *channel = file->private_data; int signal; @@ -575,7 +579,11 @@ .open = pt1_open, .release = pt1_release, .read = pt1_read, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) + .unlocked_ioctl = pt1_ioctl, +#else .ioctl = pt1_ioctl, +#endif .llseek = no_llseek, };