the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI

PATCH In review Adrian Bunk 2 participants 7 messages Jul 1, 2007 – Jul 8, 2007

Subsystems (2)

Documentation ACPI

lore

Share & tools

lore

Adrian Bunk

author

2007-07-01 20:20 UTC #0 lore raw

PATCH 1/1 the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI

This patch contains the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI.

Signed-off-by Adrian Bunk <[email protected]>

Acked-by Venkatesh Pallipadi <[email protected]>

Acked-by Dave Jones <[email protected]>

---

This patch has been sent on:
- 6 Apr 2007

 Documentation/feature-removal-schedule.txt        |   23 -
 arch/i386/kernel/cpu/cpufreq/Kconfig              |   18 
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |  280 --------------
 arch/x86_64/kernel/cpufreq/Kconfig                |    6 
 4 files changed, 21 insertions(+), 306 deletions(-)

arch/i386/kernel/cpu/cpufreq/Kconfig renamed from arch/i386/kernel/cpu/cpufreq/Kconfig.old +2 ~~-16~~

@@ -109,7 +109,7 @@
 config X86_SPEEDSTEP_CENTRINO
 	tristate "Intel Enhanced SpeedStep"
 	select CPU_FREQ_TABLE
-	select X86_SPEEDSTEP_CENTRINO_TABLE if (!X86_SPEEDSTEP_CENTRINO_ACPI)
+	select X86_SPEEDSTEP_CENTRINO_TABLE
 	help
 	  This adds the CPUFreq driver for Enhanced SpeedStep enabled
 	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,

@@ -121,20 +121,6 @@
 
 	  If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
-	bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
-	depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
-	depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
-	help
-	  This is deprecated and this functionality is now merged into
-	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
-	  speedstep_centrino.
-	  Use primarily the information provided in the BIOS ACPI tables
-	  to determine valid CPU frequency and voltage pairings. It is
-	  required for the driver to work on non-Banias CPUs.
-
-	  If in doubt, say Y.
-
 config X86_SPEEDSTEP_CENTRINO_TABLE
 	bool "Built-in tables for Banias CPUs"
 	depends on X86_SPEEDSTEP_CENTRINO

@@ -222,7 +207,7 @@
 config X86_ACPI_CPUFREQ_PROC_INTF
 	bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on PROC_FS
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
 	help
 	  This enables the deprecated /proc/acpi/processor/../performance
 	  interface. While it is helpful for debugging, the generic,

arch/x86_64/kernel/cpufreq/Kconfig renamed from arch/x86_64/kernel/cpufreq/Kconfig.old +1 -5

@@ -42,10 +42,6 @@
 
 	  If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
-	bool
-	depends on X86_SPEEDSTEP_CENTRINO
-
 config X86_ACPI_CPUFREQ
 	tristate "ACPI Processor P-States driver"
 	select CPU_FREQ_TABLE

@@ -65,7 +60,7 @@
 config X86_ACPI_CPUFREQ_PROC_INTF
         bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on PROC_FS
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
 	help
 	  This enables the deprecated /proc/acpi/processor/../performance
 	  interface. While it is helpful for debugging, the generic,

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +18 ~~-262~~

324 lines not on this page · raw message

Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 ~~-22~~

@@ -214,28 +214,6 @@
 
 ---------------------------
 
-What:	ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver
-When:	December 2006
-Why:	Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
-	functionally very much similar. They talk to ACPI in same way. Only
-	difference between them is the way they do frequency transitions.
-	One uses MSRs and the other one uses IO ports. Functionaliy of
-	speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.
-	That means one common driver will support all Intel Enhanced Speedstep
-	capable CPUs. That means less confusion over name of
-	speedstep-centrino driver (with that driver supposed to be used on
-	non-centrino platforms). That means less duplication of code and
-	less maintenance effort and no possibility of these two drivers
-	going out of sync.
-	Current users of speedstep_centrino with ACPI hooks are requested to
-	switch over to acpi-cpufreq driver. speedstep-centrino will continue
-	to work using older non-ACPI static table based scheme even after this
-	date.
-
-Who:	Venkatesh Pallipadi <[email protected]>
-
----------------------------
-
 What:	/sys/firmware/acpi/namespace
 When:	2.6.21
 Why:	The ACPI namespace is effectively the symbol list for

Dave Jones

2007-07-02 23:22 UTC #1 lore raw

On Sun, Jul 01, 2007 at 10:20:37PM +0200, Adrian Bunk wrote:

Hi Adrian,

Quoted 5 lines

This patch contains the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI.
Signed-off-by Adrian Bunk <[email protected]>
Acked-by Venkatesh Pallipadi <[email protected]>
Acked-by Dave Jones <[email protected]>

Can you do this against -mm please ?
There's been some changes, which mean that your patch won't apply without fuzz, which git-apply hates.

(19:06:04:davej@hera:cpufreq)$ git-applymbox -k ~/cf
1 patch(es) to process.

Applying '[CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI'

error: patch failed: arch/x86_64/kernel/cpufreq/Kconfig:65
error: arch/x86_64/kernel/cpufreq/Kconfig: patch does not apply

Thanks,

Dave

Signature · 1 line

http://www.codemonkey.org.uk

Adrian Bunk

author

2007-07-02 23:42 UTC #2 lore raw

PATCH 1/1 the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI

Quoted 3 lines · Dave Jones

On Sun, Jul 01, 2007 at 10:20:37PM +0200, Adrian Bunk wrote:
Hi Adrian,

Hi Dave,

Quoted 10 lines

Quoted 5 lines
This patch contains the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI.
Signed-off-by Adrian Bunk <[email protected]>
Acked-by Venkatesh Pallipadi <[email protected]>
Acked-by Dave Jones <[email protected]>
Can you do this against -mm please ?
There's been some changes, which mean that your patch won't apply without fuzz, which git-apply hates.

Quoted 7 lines

(19:06:04:davej@hera:cpufreq)$ git-applymbox -k ~/cf
1 patch(es) to process.
Applying '[CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI'
error: patch failed: arch/x86_64/kernel/cpufreq/Kconfig:65
error: arch/x86_64/kernel/cpufreq/Kconfig: patch does not apply

I made the patch against 2.6.22-rc6-mm1 (based on an older version of this patch) but I missed the fuzz (and GNU patch defaults to accept patches with a fuzz of 2).

Below is a version of the patch with the fuzz edited out.

Quoted 3 lines

Thanks,
Dave

cu
Adrian

<-- snip -->

This patch contains the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI.

Signed-off-by Adrian Bunk <[email protected]>

Acked-by Venkatesh Pallipadi <[email protected]>

Acked-by Dave Jones <[email protected]>

---

 Documentation/feature-removal-schedule.txt        |   23 -
 arch/i386/kernel/cpu/cpufreq/Kconfig              |   18 
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |  280 --------------
 arch/x86_64/kernel/cpufreq/Kconfig                |    6 
 4 files changed, 21 insertions(+), 306 deletions(-)

arch/i386/kernel/cpu/cpufreq/Kconfig renamed from arch/i386/kernel/cpu/cpufreq/Kconfig.old +2 ~~-16~~

@@ -109,7 +109,7 @@
 config X86_SPEEDSTEP_CENTRINO
 	tristate "Intel Enhanced SpeedStep"
 	select CPU_FREQ_TABLE
-	select X86_SPEEDSTEP_CENTRINO_TABLE if (!X86_SPEEDSTEP_CENTRINO_ACPI)
+	select X86_SPEEDSTEP_CENTRINO_TABLE
 	help
 	  This adds the CPUFreq driver for Enhanced SpeedStep enabled
 	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,

@@ -121,20 +121,6 @@
 
 	  If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
-	bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
-	depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
-	depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
-	help
-	  This is deprecated and this functionality is now merged into
-	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
-	  speedstep_centrino.
-	  Use primarily the information provided in the BIOS ACPI tables
-	  to determine valid CPU frequency and voltage pairings. It is
-	  required for the driver to work on non-Banias CPUs.
-
-	  If in doubt, say Y.
-
 config X86_SPEEDSTEP_CENTRINO_TABLE
 	bool "Built-in tables for Banias CPUs"
 	depends on X86_SPEEDSTEP_CENTRINO

@@ -222,7 +207,7 @@
 config X86_ACPI_CPUFREQ_PROC_INTF
 	bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on PROC_FS
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
 	help
 	  This enables the deprecated /proc/acpi/processor/../performance
 	  interface. While it is helpful for debugging, the generic,

arch/x86_64/kernel/cpufreq/Kconfig renamed from arch/x86_64/kernel/cpufreq/Kconfig.old +1 -5

@@ -42,10 +42,6 @@
 
 	  If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
-	bool
-	depends on X86_SPEEDSTEP_CENTRINO
-
 config X86_ACPI_CPUFREQ
 	tristate "ACPI Processor P-States driver"
 	select CPU_FREQ_TABLE

@@ -65,1 +60,1 @@
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +18 ~~-262~~

324 lines not on this page · raw message

Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 ~~-22~~

@@ -214,28 +214,6 @@
 
 ---------------------------
 
-What:	ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver
-When:	December 2006
-Why:	Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
-	functionally very much similar. They talk to ACPI in same way. Only
-	difference between them is the way they do frequency transitions.
-	One uses MSRs and the other one uses IO ports. Functionaliy of
-	speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.
-	That means one common driver will support all Intel Enhanced Speedstep
-	capable CPUs. That means less confusion over name of
-	speedstep-centrino driver (with that driver supposed to be used on
-	non-centrino platforms). That means less duplication of code and
-	less maintenance effort and no possibility of these two drivers
-	going out of sync.
-	Current users of speedstep_centrino with ACPI hooks are requested to
-	switch over to acpi-cpufreq driver. speedstep-centrino will continue
-	to work using older non-ACPI static table based scheme even after this
-	date.
-
-Who:	Venkatesh Pallipadi <[email protected]>
-
----------------------------
-
 What:	/sys/firmware/acpi/namespace
 When:	2.6.21
 Why:	The ACPI namespace is effectively the symbol list for

Dave Jones

2007-07-03 00:36 UTC #3 lore raw

Quoted 10 lines · Adrian Bunk

Quoted 4 lines
Applying '[CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI'
error: patch failed: arch/x86_64/kernel/cpufreq/Kconfig:65
error: arch/x86_64/kernel/cpufreq/Kconfig: patch does not apply
I made the patch against 2.6.22-rc6-mm1 (based on an older version of this patch) but I missed the fuzz (and GNU patch defaults to accept patches with a fuzz of 2).
Below is a version of the patch with the fuzz edited out.

It also has the context edited out :)

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c

Quoted 5 lines

arch/x86_64/kernel/cpufreq/Kconfig renamed from arch/x86_64/kernel/cpufreq/Kconfig.old +1 -1
@@ -65,1 +60,1 @@
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +0 -0

This won't apply either.

Dave

Signature · 1 line

http://www.codemonkey.org.uk

Adrian Bunk

author

2007-07-03 01:05 UTC #4 lore raw

Quoted 6 lines · Dave Jones

Quoted 5 lines · Adrian Bunk
Quoted 4 lines
Applying '[CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI'
error: patch failed: arch/x86_64/kernel/cpufreq/Kconfig:65
error: arch/x86_64/kernel/cpufreq/Kconfig: patch does not apply

Quoted 7 lines

Quoted 5 lines
I made the patch against 2.6.22-rc6-mm1 (based on an older version of this patch) but I missed the fuzz (and GNU patch defaults to accept patches with a fuzz of 2).
Below is a version of the patch with the fuzz edited out.
It also has the context edited out :)

That's what I said.

Quoted 7 lines

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Quoted 5 lines
arch/x86_64/kernel/cpufreq/Kconfig renamed from arch/x86_64/kernel/cpufreq/Kconfig.old +1 -1
@@ -65,1 +60,1 @@
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +0 -0
This won't apply either.

  git-apply --unidiff-zero

git-apply defaulting to reject valid patches that are purposefully without context is IMHO plain silly. I'll ask the git maintainers to change this.

Quoted 1 line

Dave

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Dave Jones

2007-07-03 01:13 UTC #5 lore raw

Quoted 9 lines · Adrian Bunk

Quoted 7 lines
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Quoted 5 lines
arch/x86_64/kernel/cpufreq/Kconfig renamed from arch/x86_64/kernel/cpufreq/Kconfig.old +1 -1
@@ -65,1 +60,1 @@
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +0 -0
This won't apply either.
  git-apply --unidiff-zero

git-apply isn't the same thing as git-applymbox. (which doesn't know that option) The former involves a lot more hassle to get the changelog & comments pasted in, along with it getting attribution correct automatically.

Dave

Signature · 1 line

http://www.codemonkey.org.uk

Adrian Bunk

author

2007-07-08 21:38 UTC #6 lore raw

PATCH 1/1 the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI

Quoted 8 lines · Dave Jones

Quoted 6 lines · Adrian Bunk
Quoted 6 lines
Quoted 5 lines
(quoted diff) +1 -1
@@ -65,1 +60,1 @@
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +0 -0

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
This won't apply either.
  git-apply --unidiff-zero
git-apply isn't the same thing as git-applymbox. (which doesn't know that option) The former involves a lot more hassle to get the changelog & comments pasted in, along with it getting attribution correct automatically.

Next try...

Quoted 1 line

Dave

cu
Adrian

<-- snip -->

This patch contains the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI.

Signed-off-by Adrian Bunk <[email protected]>

Acked-by Venkatesh Pallipadi <[email protected]>

Acked-by Dave Jones <[email protected]>

---

 Documentation/feature-removal-schedule.txt        |   22 -
 arch/i386/kernel/cpu/cpufreq/Kconfig              |   18 
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |  280 --------------
 arch/x86_64/kernel/cpufreq/Kconfig                |    6 
 4 files changed, 21 insertions(+), 305 deletions(-)

arch/i386/kernel/cpu/cpufreq/Kconfig renamed from arch/i386/kernel/cpu/cpufreq/Kconfig.old +2 ~~-16~~

@@ -109,7 +109,7 @@
 config X86_SPEEDSTEP_CENTRINO
 	tristate "Intel Enhanced SpeedStep"
 	select CPU_FREQ_TABLE
-	select X86_SPEEDSTEP_CENTRINO_TABLE if (!X86_SPEEDSTEP_CENTRINO_ACPI)
+	select X86_SPEEDSTEP_CENTRINO_TABLE
 	help
 	  This adds the CPUFreq driver for Enhanced SpeedStep enabled
 	  mobile CPUs.  This means Intel Pentium M (Centrino) CPUs. However,

@@ -121,20 +121,6 @@
 
 	  If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
-	bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
-	depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
-	depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
-	help
-	  This is deprecated and this functionality is now merged into
-	  acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
-	  speedstep_centrino.
-	  Use primarily the information provided in the BIOS ACPI tables
-	  to determine valid CPU frequency and voltage pairings. It is
-	  required for the driver to work on non-Banias CPUs.
-
-	  If in doubt, say Y.
-
 config X86_SPEEDSTEP_CENTRINO_TABLE
 	bool "Built-in tables for Banias CPUs"
 	depends on X86_SPEEDSTEP_CENTRINO

@@ -222,7 +207,7 @@
 config X86_ACPI_CPUFREQ_PROC_INTF
 	bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on PROC_FS
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
 	help
 	  This enables the deprecated /proc/acpi/processor/../performance
 	  interface. While it is helpful for debugging, the generic,

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old +18 ~~-262~~

324 lines not on this page · raw message

Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 ~~-22~~

@@ -214,28 +214,6 @@
 
 ---------------------------
 
-What:	ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver
-When:	December 2006
-Why:	Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
-	functionally very much similar. They talk to ACPI in same way. Only
-	difference between them is the way they do frequency transitions.
-	One uses MSRs and the other one uses IO ports. Functionaliy of
-	speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.
-	That means one common driver will support all Intel Enhanced Speedstep
-	capable CPUs. That means less confusion over name of
-	speedstep-centrino driver (with that driver supposed to be used on
-	non-centrino platforms). That means less duplication of code and
-	less maintenance effort and no possibility of these two drivers
-	going out of sync.
-	Current users of speedstep_centrino with ACPI hooks are requested to
-	switch over to acpi-cpufreq driver. speedstep-centrino will continue
-	to work using older non-ACPI static table based scheme even after this
-	date.
-
-Who:	Venkatesh Pallipadi <[email protected]>
-
----------------------------
-
 What:	/sys/firmware/acpi/namespace
 When:	2.6.21
 Why:	The ACPI namespace is effectively the symbol list for

arch/x86_64/kernel/cpufreq/Kconfig renamed from arch/x86_64/kernel/cpufreq/Kconfig.old +1 -5

@@ -48,10 +48,6 @@
 
 	  If in doubt, say N.
 
-config X86_SPEEDSTEP_CENTRINO_ACPI
-	bool
-	depends on X86_SPEEDSTEP_CENTRINO
-
 config X86_ACPI_CPUFREQ
 	tristate "ACPI Processor P-States driver"
 	select CPU_FREQ_TABLE

@@ -73,7 +69,7 @@
 config X86_ACPI_CPUFREQ_PROC_INTF
 	bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on PROC_FS
-	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
+	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
 	help
 	  This enables the deprecated /proc/acpi/processor/../performance
 	  interface. While it is helpful for debugging, the generic,