Merge branch 'mm-rst' into docs-next

[linux-2.6-block.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index b9f04213a353fb2a1158dc613770f2dcc7de3707..9bdb0189caafbdeb1d47ab703b0a657853942e58 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -278,13 +278,6 @@ config BOUNCE
          by default when ZONE_DMA or HIGHMEM is selected, but you
          may say n to override this.
 
-# On the 'tile' arch, USB OHCI needs the bounce pool since tilegx will often
-# have more than 4GB of memory, but we don't currently use the IOTLB to present
-# a 32-bit address to OHCI.  So we need to use a bounce pool instead.
-config NEED_BOUNCE_POOL
-       bool
-       default y if TILE && USB_OHCI_HCD
-
 config NR_QUICK
        int
        depends on QUICKLIST
@@ -627,15 +620,14 @@ config GENERIC_EARLY_IOREMAP
 config MAX_STACK_SIZE_MB
        int "Maximum user stack size for 32-bit processes (MB)"
        default 80
-       range 8 256 if METAG
        range 8 2048
        depends on STACK_GROWSUP && (!64BIT || COMPAT)
        help
          This is the maximum stack size in Megabytes in the VM layout of 32-bit
          user processes when the stack grows upwards (currently only on parisc
-         and metag arch). The stack will be located at the highest memory
-         address minus the given value, unless the RLIMIT_STACK hard limit is
-         changed to a smaller value in which case that is used.
+         arch). The stack will be located at the highest memory address minus
+         the given value, unless the RLIMIT_STACK hard limit is changed to a
+         smaller value in which case that is used.
 
          A sane initial value is 80 MB.