Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mirror_ubuntu-artful-kernel.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e2fea580585a2645481a4c79e8f1ea394c35ad75..3ed3ff06be5d7e93d8e276ab78623a81610b30fa 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -201,7 +201,7 @@ config TWL4030_POWER
          as clock request handshaking.
 
          This driver uses board-specific data to initialize the resources
-         and load scripts controling which resources are switched off/on
+         and load scripts controlling which resources are switched off/on
          or reset when a sleep, wakeup or warm reset event occurs.
 
 config TWL4030_CODEC