diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/macintosh/therm_pm72.h | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeonfb.h | 2 |
2 files changed, 2 insertions, 2 deletions
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) |