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

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 68b9b8fd9f85f66e0cd0ddef52b3ad47fd747c79..e3e87078d03f844327f51ec9841c291ab20b812a 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -269,7 +269,7 @@ config CPM2
 
 config AXON_RAM
        tristate "Axon DDR2 memory device driver"
-       depends on PPC_IBM_CELL_BLADE
+       depends on PPC_IBM_CELL_BLADE && BLOCK
        default m
        help
          It registers one block device per Axon's DDR2 memory bank found
@@ -293,7 +293,7 @@ config CPM
 config OF_RTC
        bool
        help
-         Uses information from the OF or flattened device tree to instatiate
+         Uses information from the OF or flattened device tree to instantiate
          platform devices for direct mapped RTC chips like the DS1742 or DS1743.
 
 source "arch/powerpc/sysdev/bestcomm/Kconfig"