diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 07:18:36 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 07:18:36 +0200 |
| commit | 4783f393de3077211c14675a0e57c8a02e9190b0 (patch) | |
| tree | 6c37d8664eb072fd026db3706481d771da4495ca /drivers/misc/Kconfig | |
| parent | powerpc/perf: Fix sampling enable for PPC970 (diff) | |
| parent | powerpc/ppc64e: Fix link problem when building ppc64e_defconfig (diff) | |
| download | linux-4783f393de3077211c14675a0e57c8a02e9190b0.tar.xz linux-4783f393de3077211c14675a0e57c8a02e9190b0.zip | |
Merge remote branch 'kumar/merge' into next
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 0b591b658243..b74331260744 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" |