summaryrefslogtreecommitdiffstats
path: root/drivers/misc/Kconfig
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-10-13 16:18:36 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-10-13 16:18:36 +1100
commit4783f393de3077211c14675a0e57c8a02e9190b0 (patch)
tree6c37d8664eb072fd026db3706481d771da4495ca /drivers/misc/Kconfig
parent9f5f9ffe50e90ed73040d2100db8bfc341cee352 (diff)
parent5b8544c38e6fde6968645afd46ff681492192b86 (diff)
downloadop-kernel-dev-4783f393de3077211c14675a0e57c8a02e9190b0.zip
op-kernel-dev-4783f393de3077211c14675a0e57c8a02e9190b0.tar.gz
Merge remote branch 'kumar/merge' into next
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r--drivers/misc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0b591b6..b743312 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -368,7 +368,7 @@ config VMWARE_BALLOON
If unsure, say N.
To compile this driver as a module, choose M here: the
- module will be called vmware_balloon.
+ module will be called vmw_balloon.
config ARM_CHARLCD
bool "ARM Ltd. Character LCD Driver"
OpenPOWER on IntegriCloud