aboutsummaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 16:38:18 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 16:38:18 -0800
commit1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch)
treeb384aef82007144b067cc171d2a9aa168b50b262 /drivers/spi
parentbb37b94c68e7b37eecea8576039ae9396ca07839 (diff)
parent6b44d4e69c6144d0df71ab47ec90d2009237d48f (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 'drivers/spi')
-rw-r--r--drivers/spi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 23334c8bc4c..d895a1adb42 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -16,7 +16,7 @@ config SPI
controller and a chipselect. Most SPI slaves don't support
dynamic device discovery; some are even write-only or read-only.
- SPI is widely used by microcontollers to talk with sensors,
+ SPI is widely used by microcontrollers to talk with sensors,
eeprom and flash memory, codecs and various other controller
chips, analog to digital (and d-to-a) converters, and more.
MMC and SD cards can be accessed using SPI protocol; and for