diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/macintosh | |
| parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
| parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/smu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index d409f6759482..8ba49385c3ff 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | * - maybe add timeout to commands ? | 12 | * - maybe add timeout to commands ? |
| 13 | * - blocking version of time functions | 13 | * - blocking version of time functions |
| 14 | * - polling version of i2c commands (including timer that works with | 14 | * - polling version of i2c commands (including timer that works with |
| 15 | * interrutps off) | 15 | * interrupts off) |
| 16 | * - maybe avoid some data copies with i2c by directly using the smu cmd | 16 | * - maybe avoid some data copies with i2c by directly using the smu cmd |
| 17 | * buffer and a lower level internal interface | 17 | * buffer and a lower level internal interface |
| 18 | * - understand SMU -> CPU events and implement reception of them via | 18 | * - understand SMU -> CPU events and implement reception of them via |
| @@ -179,7 +179,7 @@ static irqreturn_t smu_db_intr(int irq, void *arg) | |||
| 179 | /* CPU might have brought back the cache line, so we need | 179 | /* CPU might have brought back the cache line, so we need |
| 180 | * to flush again before peeking at the SMU response. We | 180 | * to flush again before peeking at the SMU response. We |
| 181 | * flush the entire buffer for now as we haven't read the | 181 | * flush the entire buffer for now as we haven't read the |
| 182 | * reply lenght (it's only 2 cache lines anyway) | 182 | * reply length (it's only 2 cache lines anyway) |
| 183 | */ | 183 | */ |
| 184 | faddr = (unsigned long)smu->cmd_buf; | 184 | faddr = (unsigned long)smu->cmd_buf; |
| 185 | flush_inval_dcache_range(faddr, faddr + 256); | 185 | flush_inval_dcache_range(faddr, faddr + 256); |