diff options
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_32.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/therm_pm72.h | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeonfb.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/fb.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 8c28eb0cbdac..a820b772927d 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -988,7 +988,7 @@ static void reserve_mem(u64 base, u64 size) | |||
988 | } | 988 | } |
989 | 989 | ||
990 | /* | 990 | /* |
991 | * Initialize memory allocation mecanism, parse "memory" nodes and | 991 | * Initialize memory allocation mechanism, parse "memory" nodes and |
992 | * obtain that way the top of memory and RMO to setup out local allocator | 992 | * obtain that way the top of memory and RMO to setup out local allocator |
993 | */ | 993 | */ |
994 | static void __init prom_init_mem(void) | 994 | static void __init prom_init_mem(void) |
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c index af2a8f9f1222..7adb3845c3e9 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_32.c +++ b/arch/powerpc/platforms/powermac/cpufreq_32.c | |||
@@ -68,7 +68,7 @@ static unsigned int cur_freq; | |||
68 | static unsigned int sleep_freq; | 68 | static unsigned int sleep_freq; |
69 | 69 | ||
70 | /* | 70 | /* |
71 | * Different models uses different mecanisms to switch the frequency | 71 | * Different models uses different mechanisms to switch the frequency |
72 | */ | 72 | */ |
73 | static int (*set_speed_proc)(int low_speed); | 73 | static int (*set_speed_proc)(int low_speed); |
74 | static unsigned int (*get_speed_proc)(void); | 74 | static unsigned int (*get_speed_proc)(void); |
diff --git a/drivers/macintosh/therm_pm72.h b/drivers/macintosh/therm_pm72.h index c17e61f9c418..fc7e9b7ecaf2 100644 --- a/drivers/macintosh/therm_pm72.h +++ b/drivers/macintosh/therm_pm72.h | |||
@@ -93,7 +93,7 @@ static char * critical_overtemp_path = "/sbin/critical_overtemp"; | |||
93 | * 0. This appear to be safe enough for this first version | 93 | * 0. This appear to be safe enough for this first version |
94 | * of the driver, though I would accept any clean patch | 94 | * of the driver, though I would accept any clean patch |
95 | * doing a better use of the device-tree without turning the | 95 | * doing a better use of the device-tree without turning the |
96 | * while i2c registration mecanism into a racy mess | 96 | * while i2c registration mechanism into a racy mess |
97 | * | 97 | * |
98 | * Note: Xserve changed this. We have some bits on the K2 bus, | 98 | * Note: Xserve changed this. We have some bits on the K2 bus, |
99 | * which I arbitrarily set to 0x200. Ultimately, we really want | 99 | * which I arbitrarily set to 0x200. Ultimately, we really want |
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index 1645943b1123..db2304b59fd5 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
@@ -382,7 +382,7 @@ struct radeonfb_info { | |||
382 | /* Note about this function: we have some rare cases where we must not schedule, | 382 | /* Note about this function: we have some rare cases where we must not schedule, |
383 | * this typically happen with our special "wake up early" hook which allows us to | 383 | * this typically happen with our special "wake up early" hook which allows us to |
384 | * wake up the graphic chip (and thus get the console back) before everything else | 384 | * wake up the graphic chip (and thus get the console back) before everything else |
385 | * on some machines that support that mecanism. At this point, interrupts are off | 385 | * on some machines that support that mechanism. At this point, interrupts are off |
386 | * and scheduling is not permitted | 386 | * and scheduling is not permitted |
387 | */ | 387 | */ |
388 | static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) | 388 | static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) |
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 | ||