path: root/Documentation/isdn
diff options
authorTilman Schmidt <>2009-06-20 01:10:38 -0700
committerDavid S. Miller <>2009-06-20 01:10:38 -0700
commit952e57ba3769d6fc6139b8a99c32ea2bb63f23e9 (patch)
tree5bdfe58c714d6af58d248b6401df6429aafb66ea /Documentation/isdn
parent6877f54e6a3326c99aaf84b7bff6a3019da0b847 (diff)
isdn: clean up documentation index
Remove duplicates, a stray merge conflict marker, and an entry for a file which doesn't exist, and move one entry to its correct alphabetical place. Signed-off-by: Tilman Schmidt <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'Documentation/isdn')
1 files changed, 2 insertions, 17 deletions
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX
index f6010a536590..e87e336f590e 100644
--- a/Documentation/isdn/00-INDEX
+++ b/Documentation/isdn/00-INDEX
@@ -14,25 +14,14 @@ README
- general info on what you need and what to do for Linux ISDN.
- general info for FAQ.
- - info for running audio over ISDN.
- - info for using Fax over ISDN.
- - info on the drivers for Siemens Gigaset ISDN adapters.
- - info on the ICN-ISDN-card and its driver.
->>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
- info on the HiSax driver which replaces the old teles.
+ - info on driver for IBM ACT-2000 card.
- info for running audio over ISDN.
- info on driver for AVM-B1 ISDN card.
- - info on driver for IBM ACT-2000 card.
- - info on driver for Eicon active cards.
- info on "CONCAP" encapsulation protocol interface used for X.25.
@@ -59,7 +48,3 @@ README.x25
- info for running X.25 over ISDN.
- frequently asked questions about running PPP over ISDN.
- - info on driver for Hypercope active HYSDN cards
- - info on the Modular ISDN subsystem (mISDN).