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/usb/net | |
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/usb/net')
-rw-r--r-- | drivers/usb/net/asix.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/cdc_ether.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/cdc_subset.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/gl620a.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/net1080.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/plusb.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/rndis_host.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/rtl8150.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/usbnet.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/zaurus.c | 1 |
10 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c index 37111acec875..2e2bbc003e93 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c | |||
@@ -22,7 +22,6 @@ | |||
22 | // #define DEBUG // error path messages, extra info | 22 | // #define DEBUG // error path messages, extra info |
23 | // #define VERBOSE // more; success messages | 23 | // #define VERBOSE // more; success messages |
24 | 24 | ||
25 | #include <linux/config.h> | ||
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <linux/kmod.h> | 26 | #include <linux/kmod.h> |
28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c index efd195b5912c..82ce0358d9a3 100644 --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/usb/net/cdc_ether.c | |||
@@ -20,7 +20,6 @@ | |||
20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/cdc_subset.c b/drivers/usb/net/cdc_subset.c index ec801e8bb1bb..e2fae85851a3 100644 --- a/drivers/usb/net/cdc_subset.c +++ b/drivers/usb/net/cdc_subset.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
22 | #include <linux/kmod.h> | 21 | #include <linux/kmod.h> |
23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c index faf1e86be687..3155f25f1d48 100644 --- a/drivers/usb/net/gl620a.c +++ b/drivers/usb/net/gl620a.c | |||
@@ -21,7 +21,6 @@ | |||
21 | // #define DEBUG // error path messages, extra info | 21 | // #define DEBUG // error path messages, extra info |
22 | // #define VERBOSE // more; success messages | 22 | // #define VERBOSE // more; success messages |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c index 78e6a43b1087..a9b6eeac3e3f 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/usb/net/net1080.c | |||
@@ -20,7 +20,6 @@ | |||
20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/plusb.c b/drivers/usb/net/plusb.c index 4fe863389cb7..5d17cdfc7bab 100644 --- a/drivers/usb/net/plusb.c +++ b/drivers/usb/net/plusb.c | |||
@@ -20,7 +20,6 @@ | |||
20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c index f551546d7521..c2a28d88ef3c 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/usb/net/rndis_host.c | |||
@@ -20,7 +20,6 @@ | |||
20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index 1bbbae283c0b..718f8e2b552b 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * version 2 as published by the Free Software Foundation. | 6 | * version 2 as published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 362d6907c9bb..54183e173a6d 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
@@ -33,7 +33,6 @@ | |||
33 | // #define DEBUG // error path messages, extra info | 33 | // #define DEBUG // error path messages, extra info |
34 | // #define VERBOSE // more; success messages | 34 | // #define VERBOSE // more; success messages |
35 | 35 | ||
36 | #include <linux/config.h> | ||
37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
38 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c index 813e470d0600..144566bda583 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/usb/net/zaurus.c | |||
@@ -20,7 +20,6 @@ | |||
20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |