Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block

[~andy/linux] / arch / arm / mach-sa1100 / Kconfig

diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index ca14dbdcfb222df027713bc2eac93ae7ac6d3e2b..04f9784ff0edab68132d31bc15110935a4b60883 100644 (file)
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -4,7 +4,7 @@ menu "SA11x0 Implementations"
 
 config SA1100_ASSABET
        bool "Assabet"
-       select CPU_FREQ_SA1110
+       select ARM_SA1110_CPUFREQ
        help
          Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
          Microprocessor Development Board (also known as the Assabet).
@@ -20,7 +20,7 @@ config ASSABET_NEPONSET
 
 config SA1100_CERF
        bool "CerfBoard"
-       select CPU_FREQ_SA1110
+       select ARM_SA1110_CPUFREQ
        help
          The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
          More information is available at:
@@ -47,7 +47,7 @@ endchoice
 
 config SA1100_COLLIE
        bool "Sharp Zaurus SL5500"
-       # FIXME: select CPU_FREQ_SA11x0
+       # FIXME: select ARM_SA11x0_CPUFREQ
        select SHARP_LOCOMO
        select SHARP_PARAM
        select SHARP_SCOOP
@@ -56,7 +56,7 @@ config SA1100_COLLIE
 
 config SA1100_H3100
        bool "Compaq iPAQ H3100"
-       select CPU_FREQ_SA1110
+       select ARM_SA1110_CPUFREQ
        select HTC_EGPIO
        help
          Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -67,7 +67,7 @@ config SA1100_H3100
 
 config SA1100_H3600
        bool "Compaq iPAQ H3600/H3700"
-       select CPU_FREQ_SA1110
+       select ARM_SA1110_CPUFREQ
        select HTC_EGPIO
        help
          Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -78,7 +78,7 @@ config SA1100_H3600
 
 config SA1100_BADGE4
        bool "HP Labs BadgePAD 4"
-       select CPU_FREQ_SA1100
+       select ARM_SA1100_CPUFREQ
        select SA1111
        help
          Say Y here if you want to build a kernel for the HP Laboratories
@@ -86,7 +86,7 @@ config SA1100_BADGE4
 
 config SA1100_JORNADA720
        bool "HP Jornada 720"
-       # FIXME: select CPU_FREQ_SA11x0
+       # FIXME: select ARM_SA11x0_CPUFREQ
        select SA1111
        help
          Say Y here if you want to build a kernel for the HP Jornada 720
@@ -105,14 +105,14 @@ config SA1100_JORNADA720_SSP
 
 config SA1100_HACKKIT
        bool "HackKit Core CPU Board"
-       select CPU_FREQ_SA1100
+       select ARM_SA1100_CPUFREQ
        help
          Say Y here to support the HackKit Core CPU Board
          <http://hackkit.eletztrick.de>;
 
 config SA1100_LART
        bool "LART"
-       select CPU_FREQ_SA1100
+       select ARM_SA1100_CPUFREQ
        help
          Say Y here if you are using the Linux Advanced Radio Terminal
          (also known as the LART).  See <http://www.lartmaker.nl/> for
@@ -120,7 +120,7 @@ config SA1100_LART
 
 config SA1100_NANOENGINE
        bool "nanoEngine"
-       select CPU_FREQ_SA1110
+       select ARM_SA1110_CPUFREQ
        select PCI
        select PCI_NANOENGINE
        help
@@ -130,7 +130,7 @@ config SA1100_NANOENGINE
 
 config SA1100_PLEB
        bool "PLEB"
-       select CPU_FREQ_SA1100
+       select ARM_SA1100_CPUFREQ
        help
          Say Y here if you are using version 1 of the Portable Linux
          Embedded Board (also known as PLEB).
@@ -139,7 +139,7 @@ config SA1100_PLEB
 
 config SA1100_SHANNON
        bool "Shannon"
-       select CPU_FREQ_SA1100
+       select ARM_SA1100_CPUFREQ
        help
          The Shannon (also known as a Tuxscreen, and also as a IS2630) was a
          limited edition webphone produced by Philips. The Shannon is a SA1100
@@ -148,7 +148,7 @@ config SA1100_SHANNON
 
 config SA1100_SIMPAD
        bool "Simpad"
-       select CPU_FREQ_SA1110
+       select ARM_SA1110_CPUFREQ
        help
          The SIEMENS webpad SIMpad is based on the StrongARM 1110. There
          are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB