summaryrefslogtreecommitdiffstats
path: root/Documentation/dvb/bt8xx.txt
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-08 07:45:47 +0200
committerLen Brown <len.brown@intel.com>2005-09-08 07:45:47 +0200
commit64e47488c913ac704d465a6af86a26786d1412a5 (patch)
treed3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /Documentation/dvb/bt8xx.txt
parent[ACPI] revert bad processor_core.c patch for bug 5128 (diff)
parent[SCSI] Re-do "final klist fixes" (diff)
downloadlinux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz
linux-64e47488c913ac704d465a6af86a26786d1412a5.zip
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'Documentation/dvb/bt8xx.txt')
-rw-r--r--Documentation/dvb/bt8xx.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt
index e6b8d05bc08d..4b8c326c6aac 100644
--- a/Documentation/dvb/bt8xx.txt
+++ b/Documentation/dvb/bt8xx.txt
@@ -16,7 +16,7 @@ Enable the following options:
"Device drivers" => "Multimedia devices"
=> "Video For Linux" => "BT848 Video For Linux"
"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices"
- => "DVB for Linux" "DVB Core Support" "Nebula/Pinnacle PCTV/TwinHan PCI Cards"
+ => "DVB for Linux" "DVB Core Support" "BT8xx based PCI cards"
3) Loading Modules, described by two approaches
===============================================