---
 arch/i386/kernel/cpu/cpufreq/Kconfig |   69 +++++++++++++++++------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

Index: linux-2.6.17-rc3-no1/arch/i386/kernel/cpu/cpufreq/Kconfig
===================================================================
--- linux-2.6.17-rc3-no1.orig/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ linux-2.6.17-rc3-no1/arch/i386/kernel/cpu/cpufreq/Kconfig
@@ -107,44 +107,45 @@ config X86_GX_SUSPMOD
 config X86_SPEEDSTEP_CENTRINO
 	tristate "Intel Enhanced SpeedStep"
 	select CPU_FREQ_TABLE
-        select X86_SPEEDSTEP_CENTRINO_ACPI if (!X86_SPEEDSTEP_CENTRINO_BUILTIN || (!X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS  && !X86_SPEEDSTEP_CENTRINO_BUILTIN_DOTHAN && !X86_SPEEDSTEP_CENTRINO_BUILTIN_SONOMA ))
-        help
-          This adds the CPUFreq driver for Enhanced SpeedStep enabled
-          mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,
-          you also need to say Y below to at least one of the following options:
-           - "Use ACPI tables to decode..." [which might imply enabling ACPI]
-           - "Built-in Tables for ... CPUs"
-           - "Default table"
-
-          You can also say yes to all of these options. In this configuration the
-          driver will first try to use ACPI. Then if it fails it will try to use
-          a built-in table if there is one matching the CPU. And as a last resort
-          a default table will be used.
-
-          In the last case you will also want to say yes to "Userspace control of
-          CPU frequency/voltage table" to setup the frequency/voltage operating
-          points of the CPU from the userspace. This is because de default table
-          will initially have only one operating point. This means that you will
-          need to add yourself the other control points to switch the CPU between
-          different frequencies.
+	select X86_SPEEDSTEP_CENTRINO_ACPI if (!X86_SPEEDSTEP_CENTRINO_BUILTIN || (!X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS  && !X86_SPEEDSTEP_CENTRINO_BUILTIN_DOTHAN && !X86_SPEEDSTEP_CENTRINO_BUILTIN_SONOMA ))
+	help
+	  This adds the CPUFreq driver for Enhanced SpeedStep enabled
+	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,
+	  you also need to say Y below to at least one of the following options:
+	   - "Use ACPI tables to decode..." [which might imply enabling ACPI]
+	   - "Built-in Tables for ... CPUs"
+	   - "Default table"
+
+	  You can also say yes to all of these options. In this configuration the
+	  driver will first try to use ACPI. Then if it fails it will try to use
+	  a built-in table if there is one matching the CPU. And as a last resort
+	  a default table will be used.
+
+	  In the last case you will also want to say yes to "Userspace control of
+	  CPU frequency/voltage table" to setup the frequency/voltage operating
+	  points of the CPU from the userspace. This is because de default table
+	  will initially have only one operating point. This means that you will
+	  need to add yourself the other control points to switch the CPU between
+	  different frequencies.
 
-          For details, take a look at <file:Documentation/cpu-freq/>.
+	  For details, take a look at <file:Documentation/cpu-freq/>.
 
-          If in doubt, say N.
+	  If in doubt, say N.
 
 config X86_SPEEDSTEP_CENTRINO_SYSFS
-        bool "Userspace control of CPU frequency/voltage table"
-        depends on X86_SPEEDSTEP_CENTRINO
-        depends on SYSFS
-        depends on (X86_SPEEDSTEP_CENTRINO_BUILTIN && (X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS || X86_SPEEDSTEP_CENTRINO_BUILTIN_$+       default y
-        help
-          Add support for user space control of the CPU frequency/voltage
-          operating points table through a sysfs interface.
-
-          If you say Y here files will be created in
-          /sys/devices/system/cpu/cpu*/cpufreq/oppoints
-          allowing reading and writing of the current table values as well as
-          adding or removing operating points.
+	bool "Userspace control of CPU frequency/voltage table"
+	depends on X86_SPEEDSTEP_CENTRINO
+	depends on SYSFS
+	depends on (X86_SPEEDSTEP_CENTRINO_BUILTIN && (X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS || X86_SPEEDSTEP_CENTRINO_BUILTIN_DOTHAN || X86_SPEEDSTEP_CENTRINO_BUILTIN_SONOMA )) || X86_SPEEDSTEP_CENTRINO_ACPI || X86_SPEEDSTEP_CENTRINO_DEFAULT
+	default y
+	help
+	  Add support for user space control of the CPU frequency/voltage
+	  operating points table through a sysfs interface.
+
+	  If you say Y here files will be created in
+	  /sys/devices/system/cpu/cpu*/cpufreq/oppoints
+	  allowing reading and writing of the current table values as well as
+	  adding or removing operating points.
 
 config X86_SPEEDSTEP_CENTRINO_ACPI
 	bool "Use ACPI tables to decode valid frequency/voltage pairs"