crystalhd-snapshot/2.6.35+_ioctl_replaced_by_unlocked_ioctl.patch

   1 --- a/crystalhd_lnx.c   2010-09-26 18:55:46.000000000 +0200
   2 +++ b/crystalhd_lnx.c   2010-10-06 02:23:47.000000000 +0200
   3 @@ -279,8 +279,13 @@
   4  }
   5
   6  /* API interfaces */
   7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
   8  static int chd_dec_ioctl(struct inode *in, struct file *fd,
   9                          unsigned int cmd, unsigned long ua)
  10 +#else
  11 +static long chd_dec_ioctl(struct file *fd,
  12 +                        unsigned int cmd, unsigned long ua)
  13 +#endif
  14  {
  15         struct crystalhd_adp *adp = chd_get_adp();
  16         crystalhd_cmd_proc cproc;
  17 @@ -365,7 +370,11 @@
  18
  19  static const struct file_operations chd_dec_fops = {
  20         .owner   = THIS_MODULE,
  21 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
  22         .ioctl   = chd_dec_ioctl,
  23 +#else
  24 +       .unlocked_ioctl = chd_dec_ioctl,
  25 +#endif
  26         .open    = chd_dec_open,
  27         .release = chd_dec_close,
  28  };