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 <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>

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 <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Tilman Schmidt · David S. Miller
1 parent 6877f54e6a
Showing 1 changed file with 2 additions and 17 deletions Side-by-side Diff
Documentation/isdn/00-INDEX
@@ -14,25 +14,14 @@
 	- general info on what you need and what to do for Linux ISDN.
 README.FAQ
 	- general info for FAQ.
-README.audio
-	- info for running audio over ISDN.
-README.fax
-	- info for using Fax over ISDN.
-README.gigaset
-	- info on the drivers for Siemens Gigaset ISDN adapters.
-README.icn
-	- info on the ICN-ISDN-card and its driver.
->>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
 README.HiSax
 	- info on the HiSax driver which replaces the old teles.
+README.act2000
+	- info on driver for IBM ACT-2000 card.
 README.audio
 	- info for running audio over ISDN.
 README.avmb1
 	- info on driver for AVM-B1 ISDN card.
-README.act2000
-	- info on driver for IBM ACT-2000 card.
-README.eicon
-	- info on driver for Eicon active cards.
 README.concap
 	- info on "CONCAP" encapsulation protocol interface used for X.25.
 README.diversion
@@ -59,8 +48,4 @@
 	- info for running X.25 over ISDN.
 syncPPP.FAQ
 	- frequently asked questions about running PPP over ISDN.
-README.hysdn
-	- info on driver for Hypercope active HYSDN cards
-README.mISDN
-	- info on the Modular ISDN subsystem (mISDN).
...	...	@@ -14,25 +14,14 @@
14	14	- general info on what you need and what to do for Linux ISDN.
15	15	README.FAQ
16	16	- general info for FAQ.
17		-README.audio
18		- - info for running audio over ISDN.
19		-README.fax
20		- - info for using Fax over ISDN.
21		-README.gigaset
22		- - info on the drivers for Siemens Gigaset ISDN adapters.
23		-README.icn
24		- - info on the ICN-ISDN-card and its driver.
25		->>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
26	17	README.HiSax
27	18	- info on the HiSax driver which replaces the old teles.
	19	+README.act2000
	20	+ - info on driver for IBM ACT-2000 card.
28	21	README.audio
29	22	- info for running audio over ISDN.
30	23	README.avmb1
31	24	- info on driver for AVM-B1 ISDN card.
32		-README.act2000
33		- - info on driver for IBM ACT-2000 card.
34		-README.eicon
35		- - info on driver for Eicon active cards.
36	25	README.concap
37	26	- info on "CONCAP" encapsulation protocol interface used for X.25.
38	27	README.diversion
...	...	@@ -59,8 +48,4 @@
59	48	- info for running X.25 over ISDN.
60	49	syncPPP.FAQ
61	50	- frequently asked questions about running PPP over ISDN.
62		-README.hysdn
63		- - info on driver for Hypercope active HYSDN cards
64		-README.mISDN
65		- - info on the Modular ISDN subsystem (mISDN).