[pvrusb2] patch for kernel 2.6.21

Mark Brand mabrand at mabrand.nl
Thu Apr 26 09:22:57 CDT 2007


Hi,

The attached patch fixes a problem I got building pvrusb2-mci-20070407
for linux-2.6.21:

CC [M] /usr/src/pvrusb2/pvrusb2-mci-20070407/driver/pvrusb2-hdw.o
/usr/src/pvrusb2/pvrusb2-mci-20070407/driver/pvrusb2-hdw.c: In function
‘pvr2_hdw_register_access’:
/usr/src/pvrusb2/pvrusb2-mci-20070407/driver/pvrusb2-hdw.c:3822: error:
‘struct v4l2_register’ has no member named ‘i2c_id’
make[2]: ***
[/usr/src/pvrusb2/pvrusb2-mci-20070407/driver/pvrusb2-hdw.o] Error 1
make[1]: *** [_module_/usr/src/pvrusb2/pvrusb2-mci-20070407/driver] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.21'
make: *** [modules] Error 2

I'm guessing that linux-2.6.21 surprises us with the new v4l2 interface
which pvrusb2 wasn't expecting until 2.6.22.

Mark



-------------- next part --------------
*** pvrusb2-mci-20070407/driver/pvrusb2-options.h	Wed Feb 28 05:57:33 2007
--- pvrusb2-mci-20070407-patched/driver/pvrusb2-options.h	Thu Apr 26 16:04:58 2007
***************
*** 238,244 ****
  #define PVR2_EEPROM_IVTV
  
  /* Enable various things if kernel is recent enough or we're in V4L CVS */
! #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)) \
      || defined(PVR2_ENABLE_V4LCVS)
  #else
  #define PVR2_ENABLE_OLDREGISTER_ACCESS
--- 238,244 ----
  #define PVR2_EEPROM_IVTV
  
  /* Enable various things if kernel is recent enough or we're in V4L CVS */
! #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) \
      || defined(PVR2_ENABLE_V4LCVS)
  #else
  #define PVR2_ENABLE_OLDREGISTER_ACCESS


More information about the pvrusb2 mailing list