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 /net/ax25/ax25_timer.c | |
| 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 'net/ax25/ax25_timer.c')
| -rw-r--r-- | net/ax25/ax25_timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c index ec254057f212..72594867fab6 100644 --- a/net/ax25/ax25_timer.c +++ b/net/ax25/ax25_timer.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr) | 12 | * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr) |
| 13 | * Copyright (C) 2002 Ralf Baechle DO1GRB (ralf@gnu.org) | 13 | * Copyright (C) 2002 Ralf Baechle DO1GRB (ralf@gnu.org) |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/socket.h> | 17 | #include <linux/socket.h> |