Merge branch 'master' into for-linus

[pandora-kernel.git] / arch / m68knommu / Kconfig

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 064f591..efeb603 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -566,7 +566,7 @@ config RAMBASE
          processor address space.
 
 config RAMSIZE
-       hex "Size of RAM (in bytes)"
+       hex "Size of RAM (in bytes), or 0 for automatic"
        default "0x400000"
        help
          Define the size of the system RAM. If you select 0 then the