diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/dvb/README.dvb-usb | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/dvb/README.dvb-usb')
| -rw-r--r-- | Documentation/dvb/README.dvb-usb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb index c8238e44ed6b..c4d963a67d6f 100644 --- a/Documentation/dvb/README.dvb-usb +++ b/Documentation/dvb/README.dvb-usb | |||
| @@ -138,7 +138,7 @@ Hotplug is able to load the driver, when it is needed (because you plugged | |||
| 138 | in the device). | 138 | in the device). |
| 139 | 139 | ||
| 140 | If you want to enable debug output, you have to load the driver manually and | 140 | If you want to enable debug output, you have to load the driver manually and |
| 141 | from withing the dvb-kernel cvs repository. | 141 | from within the dvb-kernel cvs repository. |
| 142 | 142 | ||
| 143 | first have a look, which debug level are available: | 143 | first have a look, which debug level are available: |
| 144 | 144 | ||