diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 19:48:52 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 19:48:52 (GMT) |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /Documentation/serial/rocket.txt | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
| download | linux-e75d660672ddd11704b7f0fdb8ff21968587b266.tar.xz | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'Documentation/serial/rocket.txt')
| -rw-r--r-- | Documentation/serial/rocket.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/serial/rocket.txt b/Documentation/serial/rocket.txt index 1d85829..60b0398 100644 --- a/Documentation/serial/rocket.txt +++ b/Documentation/serial/rocket.txt @@ -62,7 +62,7 @@ in the system log at /var/log/messages. If installed as a module, the module must be loaded. This can be done manually by entering "modprobe rocket". To have the module loaded automatically -upon system boot, edit the /etc/modprobe.conf file and add the line +upon system boot, edit a /etc/modprobe.d/*.conf file and add the line "alias char-major-46 rocket". In order to use the ports, their device names (nodes) must be created with mknod. |