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 /fs/partitions | |
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 'fs/partitions')
-rw-r--r-- | fs/partitions/acorn.c | 1 | ||||
-rw-r--r-- | fs/partitions/efi.c | 1 | ||||
-rw-r--r-- | fs/partitions/efi.h | 1 | ||||
-rw-r--r-- | fs/partitions/ibm.c | 1 | ||||
-rw-r--r-- | fs/partitions/mac.c | 1 | ||||
-rw-r--r-- | fs/partitions/msdos.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c index c05085710fc..1bc9f372c7d 100644 --- a/fs/partitions/acorn.c +++ b/fs/partitions/acorn.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * every single manufacturer of SCSI and IDE cards created their own | 12 | * every single manufacturer of SCSI and IDE cards created their own |
13 | * method. | 13 | * method. |
14 | */ | 14 | */ |
15 | #include <linux/config.h> | ||
16 | #include <linux/buffer_head.h> | 15 | #include <linux/buffer_head.h> |
17 | #include <linux/adfs_fs.h> | 16 | #include <linux/adfs_fs.h> |
18 | 17 | ||
diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c index 0f5b017aeba..63730282ad8 100644 --- a/fs/partitions/efi.c +++ b/fs/partitions/efi.c | |||
@@ -91,7 +91,6 @@ | |||
91 | * - Code works, detects all the partitions. | 91 | * - Code works, detects all the partitions. |
92 | * | 92 | * |
93 | ************************************************************/ | 93 | ************************************************************/ |
94 | #include <linux/config.h> | ||
95 | #include <linux/crc32.h> | 94 | #include <linux/crc32.h> |
96 | #include "check.h" | 95 | #include "check.h" |
97 | #include "efi.h" | 96 | #include "efi.h" |
diff --git a/fs/partitions/efi.h b/fs/partitions/efi.h index c44fb056144..2cc89d0475b 100644 --- a/fs/partitions/efi.h +++ b/fs/partitions/efi.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #define FS_PART_EFI_H_INCLUDED | 26 | #define FS_PART_EFI_H_INCLUDED |
27 | 27 | ||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/config.h> | ||
30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
31 | #include <linux/genhd.h> | 30 | #include <linux/genhd.h> |
32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c index 830c55d86ab..d352a7381fe 100644 --- a/fs/partitions/ibm.c +++ b/fs/partitions/ibm.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 | 6 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/buffer_head.h> | 9 | #include <linux/buffer_head.h> |
11 | #include <linux/hdreg.h> | 10 | #include <linux/hdreg.h> |
12 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c index 813292f2121..c0871002d00 100644 --- a/fs/partitions/mac.c +++ b/fs/partitions/mac.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * Re-organised Feb 1998 Russell King | 6 | * Re-organised Feb 1998 Russell King |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/ctype.h> | 9 | #include <linux/ctype.h> |
11 | #include "check.h" | 10 | #include "check.h" |
12 | #include "mac.h" | 11 | #include "mac.h" |
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 9935d254186..8f12587c312 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * Re-organised Feb 1998 Russell King | 19 | * Re-organised Feb 1998 Russell King |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/config.h> | ||
23 | 22 | ||
24 | #include "check.h" | 23 | #include "check.h" |
25 | #include "msdos.h" | 24 | #include "msdos.h" |