diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-at91rm9200/board.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-ixp4xx/io.h | 2 | ||||
-rw-r--r-- | include/asm-arm/bug.h | 1 | ||||
-rw-r--r-- | include/asm-arm/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-cris/arch-v32/arbiter.h | 4 | ||||
-rw-r--r-- | include/asm-ia64/sn/tioca_provider.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/of_device.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/pmac_pfunc.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/page.h | 2 | ||||
-rw-r--r-- | include/linux/dqblk_xfs.h | 4 | ||||
-rw-r--r-- | include/linux/fb.h | 2 | ||||
-rw-r--r-- | include/linux/nfs_fs.h | 1 | ||||
-rw-r--r-- | include/linux/udp.h | 2 |
13 files changed, 13 insertions, 15 deletions
diff --git a/include/asm-arm/arch-at91rm9200/board.h b/include/asm-arm/arch-at91rm9200/board.h index 1fdd70b23809..c1ca9a4658ec 100644 --- a/include/asm-arm/arch-at91rm9200/board.h +++ b/include/asm-arm/arch-at91rm9200/board.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /* | 21 | /* |
22 | * These are data structures found in platform_device.dev.platform_data, | 22 | * These are data structures found in platform_device.dev.platform_data, |
23 | * and describing board-specfic data needed by drivers. For example, | 23 | * and describing board-specific data needed by drivers. For example, |
24 | * which pin is used for a given GPIO role. | 24 | * which pin is used for a given GPIO role. |
25 | * | 25 | * |
26 | * In 2.6, drivers should strongly avoid board-specific knowledge so | 26 | * In 2.6, drivers should strongly avoid board-specific knowledge so |
diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h index b59520e56fc7..0d517267fb63 100644 --- a/include/asm-arm/arch-ixp4xx/io.h +++ b/include/asm-arm/arch-ixp4xx/io.h | |||
@@ -38,7 +38,7 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data); | |||
38 | * 2) If > 64MB of memory space is required, the IXP4xx can be configured | 38 | * 2) If > 64MB of memory space is required, the IXP4xx can be configured |
39 | * to use indirect registers to access PCI (as we do below for I/O | 39 | * to use indirect registers to access PCI (as we do below for I/O |
40 | * transactions). This allows for up to 128MB (0x48000000 to 0x4fffffff) | 40 | * transactions). This allows for up to 128MB (0x48000000 to 0x4fffffff) |
41 | * of memory on the bus. The disadvantadge of this is that every | 41 | * of memory on the bus. The disadvantage of this is that every |
42 | * PCI access requires three local register accesses plus a spinlock, | 42 | * PCI access requires three local register accesses plus a spinlock, |
43 | * but in some cases the performance hit is acceptable. In addition, | 43 | * but in some cases the performance hit is acceptable. In addition, |
44 | * you cannot mmap() PCI devices in this case. | 44 | * you cannot mmap() PCI devices in this case. |
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h index 7fb02138f585..0e36fd5d87df 100644 --- a/include/asm-arm/bug.h +++ b/include/asm-arm/bug.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _ASMARM_BUG_H | 1 | #ifndef _ASMARM_BUG_H |
2 | #define _ASMARM_BUG_H | 2 | #define _ASMARM_BUG_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #ifdef CONFIG_BUG | 5 | #ifdef CONFIG_BUG |
7 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 6 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h index c46b5c84275f..8a7554f03984 100644 --- a/include/asm-arm/thread_info.h +++ b/include/asm-arm/thread_info.h | |||
@@ -116,7 +116,7 @@ extern void iwmmxt_task_release(struct thread_info *); | |||
116 | 116 | ||
117 | /* | 117 | /* |
118 | * We use bit 30 of the preempt_count to indicate that kernel | 118 | * We use bit 30 of the preempt_count to indicate that kernel |
119 | * preemption is occuring. See include/asm-arm/hardirq.h. | 119 | * preemption is occurring. See include/asm-arm/hardirq.h. |
120 | */ | 120 | */ |
121 | #define PREEMPT_ACTIVE 0x40000000 | 121 | #define PREEMPT_ACTIVE 0x40000000 |
122 | 122 | ||
diff --git a/include/asm-cris/arch-v32/arbiter.h b/include/asm-cris/arch-v32/arbiter.h index dba3c285cacd..081a911d7af1 100644 --- a/include/asm-cris/arch-v32/arbiter.h +++ b/include/asm-cris/arch-v32/arbiter.h | |||
@@ -20,8 +20,8 @@ enum | |||
20 | arbiter_all_accesses = 0xff | 20 | arbiter_all_accesses = 0xff |
21 | }; | 21 | }; |
22 | 22 | ||
23 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 23 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
24 | unsigned long bandwidth); | 24 | unsigned long bandwidth); |
25 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, | 25 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, |
26 | unsigned long clients, unsigned long accesses, | 26 | unsigned long clients, unsigned long accesses, |
27 | watch_callback* cb); | 27 | watch_callback* cb); |
diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h index ab7fe2463468..65cdd73c2a57 100644 --- a/include/asm-ia64/sn/tioca_provider.h +++ b/include/asm-ia64/sn/tioca_provider.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #define PV908234 (1 << 1) | 27 | #define PV908234 (1 << 1) |
28 | /* CA:AGPDMA write request data mismatch with ABC1CL merge */ | 28 | /* CA:AGPDMA write request data mismatch with ABC1CL merge */ |
29 | #define PV895469 (1 << 1) | 29 | #define PV895469 (1 << 1) |
30 | /* TIO:CA TLB invalidate of written GART entries possibly not occuring in CA*/ | 30 | /* TIO:CA TLB invalidate of written GART entries possibly not occurring in CA*/ |
31 | #define PV910244 (1 << 1) | 31 | #define PV910244 (1 << 1) |
32 | 32 | ||
33 | struct tioca_dmamap{ | 33 | struct tioca_dmamap{ |
diff --git a/include/asm-powerpc/of_device.h b/include/asm-powerpc/of_device.h index 6249a7c39639..c5c0b0b3cd52 100644 --- a/include/asm-powerpc/of_device.h +++ b/include/asm-powerpc/of_device.h | |||
@@ -9,7 +9,7 @@ | |||
9 | /* | 9 | /* |
10 | * The of_platform_bus_type is a bus type used by drivers that do not | 10 | * The of_platform_bus_type is a bus type used by drivers that do not |
11 | * attach to a macio or similar bus but still use OF probing | 11 | * attach to a macio or similar bus but still use OF probing |
12 | * mecanism | 12 | * mechanism |
13 | */ | 13 | */ |
14 | extern struct bus_type of_platform_bus_type; | 14 | extern struct bus_type of_platform_bus_type; |
15 | 15 | ||
diff --git a/include/asm-powerpc/pmac_pfunc.h b/include/asm-powerpc/pmac_pfunc.h index cef61304ffc2..1330d6a58c57 100644 --- a/include/asm-powerpc/pmac_pfunc.h +++ b/include/asm-powerpc/pmac_pfunc.h | |||
@@ -205,7 +205,7 @@ extern void pmf_do_irq(struct pmf_function *func); | |||
205 | * | 205 | * |
206 | * The args array contains as many arguments as is required by the function, | 206 | * The args array contains as many arguments as is required by the function, |
207 | * this is dependent on the function you are calling, unfortunately Apple | 207 | * this is dependent on the function you are calling, unfortunately Apple |
208 | * mecanism provides no way to encode that so you have to get it right at | 208 | * mechanism provides no way to encode that so you have to get it right at |
209 | * the call site. Some functions require no args, in which case, you can | 209 | * the call site. Some functions require no args, in which case, you can |
210 | * pass NULL. | 210 | * pass NULL. |
211 | * | 211 | * |
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index 0b19af82507f..fe95c8258cf9 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h | |||
@@ -170,7 +170,7 @@ extern __inline__ int get_order(unsigned long size) | |||
170 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 170 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
171 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 171 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
172 | 172 | ||
173 | /* We do define AT_SYSINFO_EHDR but don't use the gate mecanism */ | 173 | /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */ |
174 | #define __HAVE_ARCH_GATE_AREA 1 | 174 | #define __HAVE_ARCH_GATE_AREA 1 |
175 | 175 | ||
176 | #include <asm-generic/memory_model.h> | 176 | #include <asm-generic/memory_model.h> |
diff --git a/include/linux/dqblk_xfs.h b/include/linux/dqblk_xfs.h index 2fda1b2aabd9..527504c11c5e 100644 --- a/include/linux/dqblk_xfs.h +++ b/include/linux/dqblk_xfs.h | |||
@@ -125,14 +125,14 @@ typedef struct fs_disk_quota { | |||
125 | 125 | ||
126 | /* | 126 | /* |
127 | * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system. | 127 | * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system. |
128 | * Provides a centralized way to get meta infomation about the quota subsystem. | 128 | * Provides a centralized way to get meta information about the quota subsystem. |
129 | * eg. space taken up for user and group quotas, number of dquots currently | 129 | * eg. space taken up for user and group quotas, number of dquots currently |
130 | * incore. | 130 | * incore. |
131 | */ | 131 | */ |
132 | #define FS_QSTAT_VERSION 1 /* fs_quota_stat.qs_version */ | 132 | #define FS_QSTAT_VERSION 1 /* fs_quota_stat.qs_version */ |
133 | 133 | ||
134 | /* | 134 | /* |
135 | * Some basic infomation about 'quota files'. | 135 | * Some basic information about 'quota files'. |
136 | */ | 136 | */ |
137 | typedef struct fs_qfilestat { | 137 | typedef struct fs_qfilestat { |
138 | __u64 qfs_ino; /* inode number */ | 138 | __u64 qfs_ino; /* inode number */ |
diff --git a/include/linux/fb.h b/include/linux/fb.h index b45928f5c63f..ffefeeeeca93 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -557,7 +557,7 @@ struct fb_pixmap { | |||
557 | * Frame buffer operations | 557 | * Frame buffer operations |
558 | * | 558 | * |
559 | * LOCKING NOTE: those functions must _ALL_ be called with the console | 559 | * LOCKING NOTE: those functions must _ALL_ be called with the console |
560 | * semaphore held, this is the only suitable locking mecanism we have | 560 | * semaphore held, this is the only suitable locking mechanism we have |
561 | * in 2.6. Some may be called at interrupt time at this point though. | 561 | * in 2.6. Some may be called at interrupt time at this point though. |
562 | */ | 562 | */ |
563 | 563 | ||
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index d90b1bb37563..55ea853d57bc 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef _LINUX_NFS_FS_H | 9 | #ifndef _LINUX_NFS_FS_H |
10 | #define _LINUX_NFS_FS_H | 10 | #define _LINUX_NFS_FS_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/in.h> | 12 | #include <linux/in.h> |
14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
15 | #include <linux/pagemap.h> | 14 | #include <linux/pagemap.h> |
diff --git a/include/linux/udp.h b/include/linux/udp.h index bdd39be09406..90223f057d50 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h | |||
@@ -46,7 +46,7 @@ struct udp_sock { | |||
46 | unsigned int corkflag; /* Cork is required */ | 46 | unsigned int corkflag; /* Cork is required */ |
47 | __u16 encap_type; /* Is this an Encapsulation socket? */ | 47 | __u16 encap_type; /* Is this an Encapsulation socket? */ |
48 | /* | 48 | /* |
49 | * Following member retains the infomation to create a UDP header | 49 | * Following member retains the information to create a UDP header |
50 | * when the socket is uncorked. | 50 | * when the socket is uncorked. |
51 | */ | 51 | */ |
52 | __u16 len; /* total length of pending frames */ | 52 | __u16 len; /* total length of pending frames */ |