diff options
Diffstat (limited to 'include')
-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/fb.h | 2 |
4 files changed, 4 insertions, 4 deletions
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/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 | ||