diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:38:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:38:18 -0800 |
| commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
| tree | b384aef82007144b067cc171d2a9aa168b50b262 /include/asm-m68knommu | |
| parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
| parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
Diffstat (limited to 'include/asm-m68knommu')
| -rw-r--r-- | include/asm-m68knommu/mcfmbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68knommu/mcfmbus.h b/include/asm-m68knommu/mcfmbus.h index 13df9d41bd1..319899c47a2 100644 --- a/include/asm-m68knommu/mcfmbus.h +++ b/include/asm-m68knommu/mcfmbus.h @@ -37,7 +37,7 @@ #define MCFMBUS_MFDR_MBC(a) ((a)&0x3F) /*M-Bus Clock*/ /* -* Define bit flags in Controll Register +* Define bit flags in Control Register */ #define MCFMBUS_MBCR_MEN (0x80) /* M-Bus Enable */ |