diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-31 01:35:17 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-31 01:35:17 (GMT) |
| commit | 8b08e5b127670b6d5fa7170477754fc3144cb309 (patch) | |
| tree | bdfee8440555368ed920069443a2ba4fe595c9c1 /abs/core/dvb-firmware/xc5000.conf | |
| parent | 6325c32f07e7b2c360283b8f368c8b514993c9c8 (diff) | |
| download | linhes_pkgbuild-8b08e5b127670b6d5fa7170477754fc3144cb309.zip linhes_pkgbuild-8b08e5b127670b6d5fa7170477754fc3144cb309.tar.gz linhes_pkgbuild-8b08e5b127670b6d5fa7170477754fc3144cb309.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Britney Fransen (4) and others
# Via Britney Fransen
* origin/testing:
dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844
v4l-dvb: update to snapshot from 20120828. refs #844
LinHES-system: update myth_status.py to work with tuners in error. closes #843
curlftpfs: Initial Inclusion.
linhes-scripts: minor changes to myth2mkv
mythtv:Bumped to latest fixes. Added ./configure items to close #842.
LinHES-config:7.4 rdt 9th anniversary release.
Conflicts:
abs/core/LinHES-config/LinHES-release
abs/core/LinHES-config/PKGBUILD
abs/core/LinHES-system/PKGBUILD
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/core/dvb-firmware/xc5000.conf')
| -rw-r--r-- | abs/core/dvb-firmware/xc5000.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/abs/core/dvb-firmware/xc5000.conf b/abs/core/dvb-firmware/xc5000.conf index b1cf373..93b3ab4 100644 --- a/abs/core/dvb-firmware/xc5000.conf +++ b/abs/core/dvb-firmware/xc5000.conf @@ -1,4 +1,6 @@ # xc5000 # Disable power cycling and firmware reloads # -options xc5000 no_poweroff=1 +# When v4l-dvb is installed no_poweroff=1 is no longer needed. +# +#options xc5000 no_poweroff=1 |