diff options
| author | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
| commit | 7a22bb9abcb56d1010cefd204709e3888f95f735 (patch) | |
| tree | 5c38b4485f79ee8f6a9d5f9537e973f1f663f027 /sys-utils/ldattach.8 | |
| parent | 4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff) | |
| parent | 741064af10ec81635d708e9fb8373f96341246eb (diff) | |
| download | util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz | |
Merge commit 'origin/master'
Conflicts:
AUTHORS
NEWS
config/include-Makefile.am
configure.ac
mount/lomount.c
po/POTFILES.in
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
Diffstat (limited to 'sys-utils/ldattach.8')
| -rw-r--r-- | sys-utils/ldattach.8 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys-utils/ldattach.8 b/sys-utils/ldattach.8 index 4ee62293..7afe51dd 100644 --- a/sys-utils/ldattach.8 +++ b/sys-utils/ldattach.8 @@ -35,7 +35,7 @@ With no arguments, .B ldattach prints usage information. .SH LINE DISCIPLINES -As of kernel release 2.6.21, the following line disciplines are supported: +Depending on the kernel release, the following line disciplines are supported: .TP .BR TTY ( 0 ) The default line discipline, @@ -80,6 +80,9 @@ Bluetooth HCI UART driver. .TP .BR GIGASET_M101 ( 16 ) Driver for Siemens Gigaset M101 serial DECT adapter. +.TP +.BR PPS ( 18 ) +Driver for serial line Pulse Per Second (PPS) source. .SH OPTIONS .TP \fB-d\fP | \fB--debug\fP |