Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2587468..8b69104 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -1013,7 +1013,7 @@ config CONSISTENT_START_BOOL
        depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
        help
          This option allows you to set the base virtual address
        depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
        help
          This option allows you to set the base virtual address

-         of the the consistent memory pool.  This pool of virtual
+         of the consistent memory pool.  This pool of virtual

          memory is used to make consistent memory allocations.
 
 config CONSISTENT_START
          memory is used to make consistent memory allocations.
 
 config CONSISTENT_START


@@ -1024,7 +1024,7 @@ config CONSISTENT_SIZE_BOOL
        bool "Set custom consistent memory pool size"
        depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
        help
        bool "Set custom consistent memory pool size"
        depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
        help

-         This option allows you to set the size of the the
+         This option allows you to set the size of the

          consistent memory pool.  This pool of virtual memory
          is used to make consistent memory allocations.
 
          consistent memory pool.  This pool of virtual memory
          is used to make consistent memory allocations.