Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 905e86408aaaa9f4f82a6d28d2e7bfbdc1592a0d..2a85dc33907c2c66f09c3e3ce61e96ef19e23d3a 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -83,22 +83,20 @@ choice
          check out the Linux/Alpha FAQ, accessible on the WWW from
          <http://www.alphalinux.org/>. In summary:
 
-         Alcor/Alpha-XLT     AS 600
+         Alcor/Alpha-XLT     AS 600, AS 500, XL-300, XL-366
          Alpha-XL            XL-233, XL-266
          AlphaBook1          Alpha laptop
          Avanti              AS 200, AS 205, AS 250, AS 255, AS 300, AS 400
          Cabriolet           AlphaPC64, AlphaPCI64
-         DP264               DP264
+         DP264               DP264 / DS20 / ES40 / DS10 / DS10L
          EB164               EB164 21164 evaluation board
          EB64+               EB64+ 21064 evaluation board
          EB66                EB66 21066 evaluation board
          EB66+               EB66+ 21066 evaluation board
-         Jensen              DECpc 150, DEC 2000 model 300,
-         DEC 2000 model 500
+         Jensen              DECpc 150, DEC 2000 models 300, 500
          LX164               AlphaPC164-LX
          Lynx                AS 2100A
-         Miata               Personal Workstation 433a, 433au, 500a,
-         500au, 600a, or 600au
+         Miata               Personal Workstation 433/500/600 a/au
          Marvel              AlphaServer ES47 / ES80 / GS1280
          Mikasa              AS 1000
          Noname              AXPpci33, UDB (Multia)
@@ -108,9 +106,9 @@ choice
          Ruffian             RPX164-2, AlphaPC164-UX, AlphaPC164-BX
          SX164               AlphaPC164-SX
          Sable               AS 2000, AS 2100
-         Shark               DS 20L
-         Takara              Takara
-         Titan               AlphaServer ES45 / DS25
+         Shark               DS 20L
+         Takara              Takara (OEM)
+         Titan               AlphaServer ES45 / DS25 / DS15
          Wildfire            AlphaServer GS 40/80/160/320
 
          If you don't know what to do, choose "generic".
@@ -329,6 +327,9 @@ config PCI_DOMAINS
        bool
        default y
 
+config PCI_SYSCALL
+       def_bool PCI
+
 config ALPHA_CORE_AGP
        bool
        depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL
@@ -546,10 +547,14 @@ config HAVE_DEC_LOCK
        default y
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-64)"
-       range 2 64
+       int "Maximum number of CPUs (2-32)"
+       range 2 32
        depends on SMP
-       default "64"
+       default "32" if ALPHA_GENERIC || ALPHA_MARVEL
+       default "4" if !ALPHA_GENERIC && !ALPHA_MARVEL
+       help
+         MARVEL support can handle a maximum of 32 CPUs, all the others
+          with working support have a maximum of 4 CPUs.
 
 config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous Memory Support (EXPERIMENTAL)"