diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /drivers/isdn/hisax | |
parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/isdn/hisax')
-rw-r--r-- | drivers/isdn/hisax/avm_pci.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/bkm_a4t.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/bkm_a8.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/config.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/diva.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/elsa.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/elsa_ser.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/enternow_pci.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/gazel.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc_pci.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc_usb.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hisax.h | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hisax_debug.h | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/ipacx.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/isdnl3.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/l3dss1.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/niccy.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/nj_s.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/nj_u.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/sedlbauer.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/st5481.h | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/st5481_init.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/telespci.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/w6692.c | 1 |
25 files changed, 0 insertions, 25 deletions
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 4abe5ff10e72..93f3a5343a74 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
17 | #include "hisax.h" | 16 | #include "hisax.h" |
18 | #include "isac.h" | 17 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index dcb308aeb50c..de28cb54817d 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
16 | #include "hisax.h" | 15 | #include "hisax.h" |
17 | #include "isac.h" | 16 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c index 5f21b82c8c8d..9d1abfb93dde 100644 --- a/drivers/isdn/hisax/bkm_a8.c +++ b/drivers/isdn/hisax/bkm_a8.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
16 | #include "hisax.h" | 15 | #include "hisax.h" |
17 | #include "isac.h" | 16 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 27332506f9f7..5333be5d2c47 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
20 | #include <linux/config.h> | ||
21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
22 | #include "hisax.h" | 21 | #include "hisax.h" |
23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index b0ff1cc97d7c..fbb9d02e3e29 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c | |||
@@ -16,7 +16,6 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/config.h> | ||
20 | #include "hisax.h" | 19 | #include "hisax.h" |
21 | #include "isac.h" | 20 | #include "isac.h" |
22 | #include "hscx.h" | 21 | #include "hscx.h" |
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index f8ca4b323331..7a5cdb1dee1e 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c | |||
@@ -19,7 +19,6 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/config.h> | ||
23 | #include "hisax.h" | 22 | #include "hisax.h" |
24 | #include "arcofi.h" | 23 | #include "arcofi.h" |
25 | #include "isac.h" | 24 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c index 898ec0916195..0279fb323cb1 100644 --- a/drivers/isdn/hisax/elsa_ser.c +++ b/drivers/isdn/hisax/elsa_ser.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/serial.h> | 10 | #include <linux/serial.h> |
12 | #include <linux/serial_reg.h> | 11 | #include <linux/serial_reg.h> |
13 | 12 | ||
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 3341cf155531..5f4876184691 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c | |||
@@ -60,7 +60,6 @@ | |||
60 | */ | 60 | */ |
61 | 61 | ||
62 | 62 | ||
63 | #include <linux/config.h> | ||
64 | #include "hisax.h" | 63 | #include "hisax.h" |
65 | #include "isac.h" | 64 | #include "isac.h" |
66 | #include "isdnl1.h" | 65 | #include "isdnl1.h" |
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 60b04c6d9e7d..82a1d2e86cee 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c | |||
@@ -11,7 +11,6 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
16 | #include "hisax.h" | 15 | #include "hisax.h" |
17 | #include "isac.h" | 16 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index e3866b0a97fd..913fd27a1f55 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/config.h> | ||
26 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 3622720f0505..fa9615747e26 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c | |||
@@ -16,7 +16,6 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/config.h> | ||
20 | #include "hisax.h" | 19 | #include "hisax.h" |
21 | #include "hfc_pci.h" | 20 | #include "hfc_pci.h" |
22 | #include "isdnl1.h" | 21 | #include "isdnl1.h" |
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index 262c44127419..b5e571a52694 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
33 | #include <linux/stddef.h> | 33 | #include <linux/stddef.h> |
34 | #include <linux/timer.h> | 34 | #include <linux/timer.h> |
35 | #include <linux/config.h> | ||
36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
38 | #include <linux/kernel_stat.h> | 37 | #include <linux/kernel_stat.h> |
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 11fe537e2f6f..75920aa0a3c5 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * of the GNU General Public License, incorporated herein by reference. | 6 | * of the GNU General Public License, incorporated herein by reference. |
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | #include <linux/config.h> | ||
10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
12 | #include <linux/major.h> | 11 | #include <linux/major.h> |
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h index ba518a7a7fb7..ceafecdb1037 100644 --- a/drivers/isdn/hisax/hisax_debug.h +++ b/drivers/isdn/hisax/hisax_debug.h | |||
@@ -22,7 +22,6 @@ | |||
22 | #ifndef __HISAX_DEBUG_H__ | 22 | #ifndef __HISAX_DEBUG_H__ |
23 | #define __HISAX_DEBUG_H__ | 23 | #define __HISAX_DEBUG_H__ |
24 | 24 | ||
25 | #include <linux/config.h> | ||
26 | 25 | ||
27 | #ifdef CONFIG_HISAX_DEBUG | 26 | #ifdef CONFIG_HISAX_DEBUG |
28 | 27 | ||
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c index 2e9afae1254a..df5fc92a89b2 100644 --- a/drivers/isdn/hisax/ipacx.c +++ b/drivers/isdn/hisax/ipacx.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/config.h> | ||
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | #include "hisax_if.h" | 14 | #include "hisax_if.h" |
16 | #include "hisax.h" | 15 | #include "hisax.h" |
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c index c9917cd2132b..281fa27d9f00 100644 --- a/drivers/isdn/hisax/isdnl3.c +++ b/drivers/isdn/hisax/isdnl3.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include "hisax.h" | 19 | #include "hisax.h" |
20 | #include "isdnl3.h" | 20 | #include "isdnl3.h" |
21 | #include <linux/config.h> | ||
22 | 21 | ||
23 | const char *l3_revision = "$Revision: 2.22.2.3 $"; | 22 | const char *l3_revision = "$Revision: 2.22.2.3 $"; |
24 | 23 | ||
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c index e96845cdd4f6..99feae8b9210 100644 --- a/drivers/isdn/hisax/l3dss1.c +++ b/drivers/isdn/hisax/l3dss1.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include "isdnl3.h" | 23 | #include "isdnl3.h" |
24 | #include "l3dss1.h" | 24 | #include "l3dss1.h" |
25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
26 | #include <linux/config.h> | ||
27 | 26 | ||
28 | extern char *HiSax_getrev(const char *revision); | 27 | extern char *HiSax_getrev(const char *revision); |
29 | static const char *dss1_revision = "$Revision: 2.32.2.3 $"; | 28 | static const char *dss1_revision = "$Revision: 2.32.2.3 $"; |
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index 68a2159cbd11..868762cf76c6 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c | |||
@@ -14,7 +14,6 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
19 | #include "hisax.h" | 18 | #include "hisax.h" |
20 | #include "isac.h" | 19 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index a7d3cd3f36fd..1b3ac46df52c 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
10 | #include "hisax.h" | 9 | #include "hisax.h" |
11 | #include "isac.h" | 10 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index 1ae7cac98a87..7a6010eac60d 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
10 | #include "hisax.h" | 9 | #include "hisax.h" |
11 | #include "icc.h" | 10 | #include "icc.h" |
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c index 8c044a6a7fe3..11ea456626b6 100644 --- a/drivers/isdn/hisax/sedlbauer.c +++ b/drivers/isdn/hisax/sedlbauer.c | |||
@@ -39,7 +39,6 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include <linux/init.h> | 41 | #include <linux/init.h> |
42 | #include <linux/config.h> | ||
43 | #include "hisax.h" | 42 | #include "hisax.h" |
44 | #include "isac.h" | 43 | #include "isac.h" |
45 | #include "ipac.h" | 44 | #include "ipac.h" |
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h index 9ffaae7c657a..04416bad611d 100644 --- a/drivers/isdn/hisax/st5481.h +++ b/drivers/isdn/hisax/st5481.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #ifndef _ST5481_H_ | 13 | #ifndef _ST5481_H_ |
14 | #define _ST5481_H_ | 14 | #define _ST5481_H_ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | 16 | ||
18 | // USB IDs, the Product Id is in the range 0x4810-0x481F | 17 | // USB IDs, the Product Id is in the range 0x4810-0x481F |
19 | 18 | ||
diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c index 99cb0f3d59a1..2716aa5c60f7 100644 --- a/drivers/isdn/hisax/st5481_init.c +++ b/drivers/isdn/hisax/st5481_init.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * clean up debug | 24 | * clean up debug |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/config.h> | ||
28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
30 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index e82ab2251b82..a1bb73e28841 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c | |||
@@ -13,7 +13,6 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/config.h> | ||
17 | #include "hisax.h" | 16 | #include "hisax.h" |
18 | #include "isac.h" | 17 | #include "isac.h" |
19 | #include "hscx.h" | 18 | #include "hscx.h" |
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index 0352ee5f706c..00e4fa2aef51 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | #include "hisax.h" | 14 | #include "hisax.h" |
16 | #include "w6692.h" | 15 | #include "w6692.h" |