Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

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

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 274e070..c14fe91 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -41,6 +41,10 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -53,14 +57,14 @@ config GENERIC_ISA_DMA
 
 config ARCH_MAY_HAVE_PC_FDC
        bool
-       default y
 
 source "init/Kconfig"
 
 
 menu "System Type"
 
-comment "Archimedes/A5000 Implementations (select only ONE)"
+choice
+       prompt "Archimedes/A5000 Implementations"
 
 config ARCH_ARC
         bool "Archimedes"
@@ -73,8 +77,9 @@ config ARCH_ARC
 
 config ARCH_A5K
         bool "A5000"
+       select ARCH_MAY_HAVE_PC_FDC
         help
-          Say Y here to to support the Acorn A5000.
+          Say Y here to support the Acorn A5000.
 
          Linux can support the
           internal IDE disk and CD-ROM interface, serial and parallel port,
@@ -87,6 +92,7 @@ config PAGESIZE_16
           Say Y here if your Archimedes or A5000 system has only 2MB of
           memory, otherwise say N.  The resulting kernel will not run on a
           machine with 4MB of memory.
+endchoice
 endmenu
 
 config ISA_DMA_API
@@ -123,7 +129,7 @@ config ZBOOT_ROM_BSS
 config XIP_KERNEL
        bool "Execute In Place (XIP) kernel image"
        help
-         Select this option to create a kernel that can be programed into
+         Select this option to create a kernel that can be programmed into
          the OS ROMs.
 
 comment "At least one math emulation must be selected"
@@ -134,7 +140,7 @@ config FPE_NWFPE
          Say Y to include the NWFPE floating point emulator in the kernel.
          This is necessary to run most binaries. Linux does not currently
          support floating point hardware so you need to say Y here even if
-         your machine has an FPA or floating point co-processor podule.
+         your machine has an FPA or floating point co-processor module.
 
          It is also possible to say M to build the emulator as a module
          (nwfpe) or indeed to leave it out altogether. However, unless you