diff options
| -rw-r--r-- | Documentation/networking/bonding.txt | 3 | ||||
| -rw-r--r-- | Documentation/sound/oss/AudioExcelDSP16 | 4 | ||||
| -rw-r--r-- | Documentation/sound/oss/README.modules | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index d5e869814040..bfea8a338901 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt | |||
| @@ -1822,8 +1822,7 @@ modules.conf manual page. | |||
| 1822 | In this case, the following can be added to config files in | 1822 | In this case, the following can be added to config files in |
| 1823 | /etc/modprobe.d/ as: | 1823 | /etc/modprobe.d/ as: |
| 1824 | 1824 | ||
| 1825 | install bonding /sbin/modprobe tg3; /sbin/modprobe e1000; | 1825 | softdep bonding pre: tg3 e1000 |
| 1826 | /sbin/modprobe --ignore-install bonding | ||
| 1827 | 1826 | ||
| 1828 | This will load tg3 and e1000 modules before loading the bonding one. | 1827 | This will load tg3 and e1000 modules before loading the bonding one. |
| 1829 | Full documentation on this can be found in the modprobe.d and modprobe | 1828 | Full documentation on this can be found in the modprobe.d and modprobe |
diff --git a/Documentation/sound/oss/AudioExcelDSP16 b/Documentation/sound/oss/AudioExcelDSP16 index e863f9cd5941..ea8549faede9 100644 --- a/Documentation/sound/oss/AudioExcelDSP16 +++ b/Documentation/sound/oss/AudioExcelDSP16 | |||
| @@ -54,8 +54,8 @@ Loading MSS and OPL3 needs to pre load the aedsp16 module to set up correctly | |||
| 54 | the sound card. Installation dependencies must be written in configuration | 54 | the sound card. Installation dependencies must be written in configuration |
| 55 | files under /etc/modprobe.d/ directory: | 55 | files under /etc/modprobe.d/ directory: |
| 56 | 56 | ||
| 57 | install ad1848 /sbin/modprobe aedsp16 && /sbin/modprobe -i ad1848 | 57 | softdep ad1848 pre: aedsp16 |
| 58 | install opl3 /sbin/modprobe aedsp16 && /sbin/modprobe -i opl3 | 58 | softdep opl3 pre: aedsp16 |
| 59 | 59 | ||
| 60 | Then you must load the sound modules stack in this order: | 60 | Then you must load the sound modules stack in this order: |
| 61 | sound -> aedsp16 -> [ ad1848, opl3 ] | 61 | sound -> aedsp16 -> [ ad1848, opl3 ] |
diff --git a/Documentation/sound/oss/README.modules b/Documentation/sound/oss/README.modules index bf5142a7be79..cdc039421a46 100644 --- a/Documentation/sound/oss/README.modules +++ b/Documentation/sound/oss/README.modules | |||
| @@ -36,7 +36,7 @@ options adlib_card io=0x388 # FM synthesizer | |||
| 36 | Alternatively, if you have compiled in kernel level ISAPnP support: | 36 | Alternatively, if you have compiled in kernel level ISAPnP support: |
| 37 | 37 | ||
| 38 | alias char-major-14 sb | 38 | alias char-major-14 sb |
| 39 | post-install sb /sbin/modprobe "-k" "adlib_card" | 39 | softdep sb post: adlib_card |
| 40 | options adlib_card io=0x388 | 40 | options adlib_card io=0x388 |
| 41 | 41 | ||
| 42 | The effect of this is that the sound driver and all necessary bits and | 42 | The effect of this is that the sound driver and all necessary bits and |
