Driver core: change add_uevent_var to use a struct

[linux-2.6-omap-h63xx.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cbfbd981cdcd299b87a47ef0d5e30d33f25f2e8a..037664d496d7dffb72c78f54c47be83d130bb628 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -14,6 +14,11 @@ config 64BIT
        bool
        default y if PPC64
 
+config WORD_SIZE
+       int
+       default 64 if PPC64
+       default 32 if !PPC64
+
 config PPC_MERGE
        def_bool y
 
@@ -21,6 +26,18 @@ config MMU
        bool
        default y
 
+config GENERIC_CMOS_UPDATE
+       def_bool y
+
+config GENERIC_TIME
+       def_bool y
+
+config GENERIC_TIME_VSYSCALL
+       def_bool y
+
+config GENERIC_CLOCKEVENTS
+       def_bool y
+
 config GENERIC_HARDIRQS
        bool
        default y
@@ -56,6 +73,9 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config ARCH_NO_VIRT_TO_BUS
+       def_bool PPC64
+
 config PPC
        bool
        default y
@@ -89,6 +109,9 @@ config ARCH_MAY_HAVE_PC_FDC
 config PPC_OF
        def_bool y
 
+config OF
+       def_bool y
+
 config PPC_UDBG_16550
        bool
        default n
@@ -150,6 +173,7 @@ config HIGHMEM
        bool "High memory support"
        depends on PPC32
 
+source kernel/time/Kconfig
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "fs/Kconfig.binfmt"
@@ -174,17 +198,29 @@ config MATH_EMULATION
          unit, which will allow programs that use floating-point
          instructions to run.
 
+config 8XX_MINIMAL_FPEMU
+       bool "Minimal math emulation for 8xx"
+       depends on 8xx && !MATH_EMULATION
+       help
+         Older arch/ppc kernels still emulated a few floating point
+         instructions such as load and store, even when full math
+         emulation is disabled.  Say "Y" here if you want to preserve
+         this behavior.
+
+         It is recommended that you build a soft-float userspace instead.
+
 config IOMMU_VMERGE
-       bool "Enable IOMMU virtual merging (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PPC64
-       default n
+       bool "Enable IOMMU virtual merging"
+       depends on PPC64
+       default y
        help
          Cause IO segments sent to a device for DMA to be merged virtually
          by the IOMMU when they happen to have been allocated contiguously.
          This doesn't add pressure to the IOMMU allocator. However, some
          drivers don't support getting large merged segments coming back
-         from *_map_sg(). Say Y if you know the drivers you are using are
-         properly handling this case.
+         from *_map_sg().
+
+         Most drivers don't have this problem; it is safe to say Y here.
 
 config HOTPLUG_CPU
        bool "Support for enabling/disabling CPUs"
@@ -405,11 +441,6 @@ config PPC_INDIRECT_PCI
        default y if 40x || 44x
        default n
 
-config PPC_INDIRECT_PCI_BE
-       bool
-       depends PPC_INDIRECT_PCI
-       default n
-
 config EISA
        bool
 
@@ -419,6 +450,10 @@ config SBUS
 config FSL_SOC
        bool
 
+config FSL_PCI
+       bool
+       select PPC_INDIRECT_PCI
+
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
        bool
@@ -439,8 +474,10 @@ config PCI
          infrastructure code to support PCI bus devices.
 
 config PCI_DOMAINS
-       bool
-       default PCI
+       def_bool PCI
+
+config PCI_SYSCALL
+       def_bool PCI
 
 config PCI_QSPAN
        bool "QSpan PCI"
@@ -458,7 +495,7 @@ config PCI_8260
 
 config 8260_PCI9
        bool "Enable workaround for MPC826x erratum PCI 9"
-       depends on PCI_8260 && !ADS8272
+       depends on PCI_8260 && !8272
        default y
 
 choice
@@ -562,7 +599,8 @@ config TASK_SIZE_BOOL
 
 config TASK_SIZE
        hex "Size of user task space" if TASK_SIZE_BOOL
-       default "0x80000000"
+       default "0x80000000" if PPC_PREP || PPC_8xx
+       default "0xc0000000"
 
 config CONSISTENT_START_BOOL
        bool "Set custom consistent memory pool address"
@@ -574,6 +612,7 @@ config CONSISTENT_START_BOOL
 
 config CONSISTENT_START
        hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL
+       default "0xfd000000" if (NOT_COHERENT_CACHE && 8xx)
        default "0xff100000" if NOT_COHERENT_CACHE
 
 config CONSISTENT_SIZE_BOOL
@@ -635,8 +674,8 @@ menu "Instrumentation Support"
 source "arch/powerpc/oprofile/Kconfig"
 
 config KPROBES
-       bool "Kprobes (EXPERIMENTAL)"
-       depends on !BOOKE && !4xx && KALLSYMS && EXPERIMENTAL && MODULES
+       bool "Kprobes"
+       depends on !BOOKE && !4xx && KALLSYMS && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
@@ -655,3 +694,7 @@ config KEYS_COMPAT
        default y
 
 source "crypto/Kconfig"
+
+config PPC_CLOCK
+       bool
+       default n