Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e1521f32e554451a9f29c4720f69c61280adee4d..5021db2217eddfbecd628aba53ca44f6fb62ade9 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -192,6 +192,8 @@ config VECTORS_BASE
 
 source "init/Kconfig"
 
 
 source "init/Kconfig"
 

+source "kernel/Kconfig.freezer"
+

 menu "System Type"
 
 choice
 menu "System Type"
 
 choice


@@ -354,7 +356,7 @@ config ARCH_IXP4XX
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS

-       select ZONE_DMA if PCI
+       select DMABOUNCE if PCI

        help
          Support for Intel's IXP4XX (XScale) family of processors.
 
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 


@@ -538,16 +540,15 @@ config ARCH_OMAP
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 

-config ARCH_MSM7X00A
-       bool "Qualcomm MSM7X00A"
+config ARCH_MSM
+       bool "Qualcomm MSM"

        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help

-         Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
-         apps processor of the MSM7X00A and depends on a shared memory
+         Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+         apps processor of the MSM7K and depends on a shared memory

          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).

-         <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>

 
 endchoice
 
 
 endchoice