diff options
| author | James Meyer <jams@linhes.org> | 2011-01-05 16:00:10 (GMT) |
|---|---|---|
| committer | James Meyer <jams@linhes.org> | 2011-01-05 16:00:10 (GMT) |
| commit | c50c191b426d92cfdfb43c4e3f15f942760f0931 (patch) | |
| tree | 56a01a0a3a7a1d066b26c0db44d108e62b64aaa7 /abs/core/v4l-dvb/hdpvr.diff | |
| parent | 11e85b2f03ba217fe01d17763bb6832c536d768a (diff) | |
| parent | 7c860c250fff97bb77088a70dc53478a44a24f05 (diff) | |
| download | linhes_pkgbuild-c50c191b426d92cfdfb43c4e3f15f942760f0931.zip linhes_pkgbuild-c50c191b426d92cfdfb43c4e3f15f942760f0931.tar.gz linhes_pkgbuild-c50c191b426d92cfdfb43c4e3f15f942760f0931.tar.bz2 | |
Merge remote branch 'origin/testing' into testing
Diffstat (limited to 'abs/core/v4l-dvb/hdpvr.diff')
| -rw-r--r-- | abs/core/v4l-dvb/hdpvr.diff | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/abs/core/v4l-dvb/hdpvr.diff b/abs/core/v4l-dvb/hdpvr.diff index bf465e5..257ce05 100644 --- a/abs/core/v4l-dvb/hdpvr.diff +++ b/abs/core/v4l-dvb/hdpvr.diff @@ -5,7 +5,8 @@ diff -ruaN v4l-dvb-31eaa9423f98.orig/linux/drivers/media/video/hdpvr/hdpvr-core. { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID) }, { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) }, { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) }, -+ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID3) }, + { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID3) }, ++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID4) }, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, hdpvr_table); @@ -16,7 +17,8 @@ diff -ruaN v4l-dvb-31eaa9423f98.orig/linux/drivers/media/video/hdpvr/hdpvr.h v4l #define HD_PVR_PRODUCT_ID 0x4900 #define HD_PVR_PRODUCT_ID1 0x4901 #define HD_PVR_PRODUCT_ID2 0x4902 -+#define HD_PVR_PRODUCT_ID3 0x4982 + #define HD_PVR_PRODUCT_ID3 0x4982 ++#define HD_PVR_PRODUCT_ID4 0x4903 #define UNSET (-1U) |