diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 18:58:52 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 18:58:52 +0300 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/video/sm501fb.c | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
download | linux-f5bb3a5e9dcdb8435471562b6cada89525cf4df1.tar.xz |
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/video/sm501fb.c')
-rw-r--r-- | drivers/video/sm501fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 1be95a68d696..58f200c69be3 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c @@ -48,7 +48,7 @@ enum sm501_controller { HEAD_PANEL = 1, }; -/* SM501 memory adress */ +/* SM501 memory address */ struct sm501_mem { unsigned long size; unsigned long sm_addr; |