diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 2ca840a6ff..46df98aee6 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -61,7 +61,6 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 # drivers
 AddNewDriversToPackage disk scsi	: scsi_cd scsi_disk ;
 AddNewDriversToPackage disk virtual : virtio_block ;
-AddNewDriversToPackage power		: enhanced_speedstep@x86 ;
 AddNewDriversToPackage power		: acpi_battery@x86 ;
 #AddNewDriversToPackage display		: display_controls@x86 ;
 
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index f4a419d7d7..1fafbb20fe 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -60,7 +60,6 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 # drivers
 AddNewDriversToPackage disk scsi	: scsi_cd scsi_disk ;
 AddNewDriversToPackage disk virtual : virtio_block ;
-AddNewDriversToPackage power		: enhanced_speedstep@x86 ;
 AddNewDriversToPackage power		: acpi_battery@x86 ;
 #AddNewDriversToPackage display		: display_controls@x86 ;
 
diff --git a/src/add-ons/kernel/drivers/power/Jamfile b/src/add-ons/kernel/drivers/power/Jamfile
index 45feced8e9..2755d26fed 100644
--- a/src/add-ons/kernel/drivers/power/Jamfile
+++ b/src/add-ons/kernel/drivers/power/Jamfile
@@ -4,5 +4,4 @@ SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_battery ;
 SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_button ;
 SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_lid ;
 SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_thermal ;
-SubInclude HAIKU_TOP src add-ons kernel drivers power enhanced_speedstep ;
 SubInclude HAIKU_TOP src add-ons kernel drivers power x86_cpuidle ;
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/Jamfile b/src/add-ons/kernel/drivers/power/enhanced_speedstep/Jamfile
deleted file mode 100644
index 81878167d9..0000000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/Jamfile
+++ /dev/null
@@ -1,18 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers power enhanced_speedstep ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-if $(TARGET_PLATFORM) != haiku {
-	# Needed for <ACPI.h>. Unfortunately we also get the other headers there,
-	# that we don't really want.
-	UsePublicHeaders drivers ;
-}
-
-UsePrivateHeaders kernel ;
-
-KernelAddon enhanced_speedstep :
-	enhanced_speedstep.cpp
-	frequency.cpp
-	;
-
-Depends acpi_enhanced_speedstep : acpi ;
\ No newline at end of file
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp b/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
deleted file mode 100644
index eaf29c2850..0000000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright 2009, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Clemens Zeidler, haiku@clemens-zeidler.de
- */
-
-#include <KernelExport.h>
-#include <Drivers.h>
-#include <Errors.h>
-#include <string.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <kernel/arch/x86/arch_cpu.h>
-
-#include <ACPI.h>
-#include "enhanced_speedstep.h"
-#include <condition_variable.h>
-
-#include "frequency.h"
-
-
-#define EST_MODULE_NAME "drivers/power/enhanced_speedstep/driver_v1"
-
-#define EST_DEVICE_MODULE_NAME "drivers/power/enhanced_speedstep/device_v1"
-
-/* Base Namespace devices are published to */
-#define EST_BASENAME "power/enhanced_speedstep/%d"
-
-// name of pnp generator of path ids
-#define EST_PATHID_GENERATOR "enhanced_speedstep/path_id"
-
-static device_manager_info *sDeviceManager;
-static ConditionVariable sFrequencyCondition;
-static int32 sCurrentID;
-
-
-static status_t
-est_read(void* _cookie, off_t position, void *buffer, size_t* numBytes)
-{
-	if (*numBytes < 1)
-		return B_IO_ERROR;
-
-	est_cookie *device = (est_cookie *)_cookie;
-
-	if (position == 0) {
-		size_t max_len = *numBytes;
-		char *str = (char *)buffer;
-
-		snprintf(str, max_len, "CPU Frequency states:\n");
-		max_len-= strlen(str);
-		str += strlen(str);
-
-		freq_info *freqsInfo = device->available_states;
-		freq_info *f;
-		for (f = freqsInfo; f->frequency != 0; f++) {
-			snprintf(str, max_len, " Frequency %hu, Volts %hu, Power %i, "
-				"Latency %i, id %hu\n", f->frequency, f->volts, f->power, f->id,
-				EST_TRANS_LAT);
-			max_len-= strlen(str);
-			str += strlen(str);
-		}
-
-		freq_info *f2 = est_get_current(freqsInfo);
-		if (f2) {
-			snprintf(str, max_len, "\nCurrent State: Frequency %hu, Volts %hu, "
-				"Power %i, Latency %i\n", f2->frequency, f2->volts, f2->power,
-				EST_TRANS_LAT);
-		}
-
-		*numBytes = strlen((char *)buffer);
-	} else {
-		*numBytes = 0;
-	}
-
-	return B_OK;
-}
-
-
-static status_t
-est_write(void* cookie, off_t position, const void* buffer, size_t* numBytes)
-{
-	return B_ERROR;
-}
-
-
-status_t
-est_control(void* _cookie, uint32 op, void* arg, size_t len)
-{
-	est_cookie* device = (est_cookie*)_cookie;
-	status_t err = B_ERROR;
-
-	uint32* magicId;
-	uint16* id;
-	freq_info* freqInfo = NULL;
-	switch (op) {
-		case IDENTIFY_DEVICE:
-			if (len < sizeof(uint32))
-				return B_IO_ERROR;
-			magicId = (uint32*)arg;
-			*magicId = kMagicFreqID;
-			err = B_OK;
-			break;
-
-		case GET_CPU_FREQ_STATES:
-			if (len < sizeof(freq_info) * (device->number_states + 1))
-				return B_IO_ERROR;
-			freqInfo = (freq_info*)arg;
-			user_memcpy(freqInfo, device->available_states,
-				sizeof(freq_info) * (device->number_states + 1));
-			err = B_OK;
-			break;
-
-		case GET_CURENT_CPU_FREQ_STATE:
-			if (len < sizeof(uint16))
-				return B_IO_ERROR;
-			freqInfo = est_get_current(device->available_states);
-			if (!freqInfo)
-				return B_ERROR;
-			atomic_set(&sCurrentID, freqInfo->id);
-			*((uint16*)arg) = freqInfo->id;
-			err = B_OK;
-			break;
-
-		case SET_CPU_FREQ_STATE:
-			if (len < sizeof(uint16))
-				return B_IO_ERROR;
-			id = (uint16*)arg;
-			err = est_set_id16(*id);
-			if (err == B_OK) {
-				atomic_set(&sCurrentID, *id);
-				sFrequencyCondition.NotifyAll();
-			}
-			break;
-
-		case WATCH_CPU_FREQ:
-			if (len < sizeof(uint16))
-				return B_IO_ERROR;
-			sFrequencyCondition.Wait();
-			if (atomic_get(&(device->stop_watching))) {
-				atomic_set(&(device->stop_watching), 0);
-				err = B_ERROR;
-			} else {
-				*((uint16*)arg) = atomic_get(&sCurrentID);
-				err = B_OK;
-			}
-			break;
-
-		case STOP_WATCHING_CPU_FREQ:
-			atomic_set(&(device->stop_watching), 1);
-			sFrequencyCondition.NotifyAll();
-			err = B_OK;
-			break;
-	}
-	return err;
-}
-
-
-static status_t
-est_open(void *initCookie, const char *path, int flags, void** cookie)
-{
-	TRACE("est: open\n");
-	est_cookie *device;
-	device = (est_cookie *)calloc(1, sizeof(est_cookie));
-	if (device == NULL)
-		return B_NO_MEMORY;
-
-	*cookie = device;
-
-	device_node *node = (device_node *)initCookie;
-	device->node = node;
-
-	device_node *parent;
-	parent = sDeviceManager->get_parent_node(node);
-	sDeviceManager->get_driver(parent, (driver_module_info **)&device->acpi,
-		(void **)&device->acpi_cookie);
-	sDeviceManager->put_node(parent);
-
-	device->stop_watching = 0;
-
-	// enable enhanced speedstep
-	uint64 msrMisc = x86_read_msr(MSR_MISC);
-	if ((msrMisc & MSR_EST_ENABLED) == 0) {
-		TRACE("est: enable enhanced speedstep\n");
-		x86_write_msr(MSR_MISC, msrMisc | MSR_EST_ENABLED);
-
-		uint64 msrMisc = x86_read_msr(MSR_MISC);
-		if ((msrMisc & MSR_EST_ENABLED) == 0) {
-			TRACE("est: enable enhanced speedstep failed\n");
-			return B_ERROR;
-		}
-	}
-
-	// get freq_info
-	if (est_get_info(&(device->available_states)) != B_OK)
-		return B_ERROR;
-	freq_info *freqsInfo = device->available_states;
-
-	// count number of states
-	TRACE("est: frequency info:\n");
-	freq_info *f;
-	device->number_states = 0;
-	for (f = freqsInfo; f->frequency != 0; f++) {
-		TRACE("est: Frequency %u, Volts %u, Power %i, Latency %u, id %u\n",
-			f->frequency, f->volts, f->power, f->id, EST_TRANS_LAT);
-		device->number_states++;
-	}
-
-	// print current frequency
-	freq_info *f2 = est_get_current(freqsInfo);
-	if (f2) {
-		TRACE("est: Current Frequency %u, Volts %u, Power %i, Latency %u\n",
-			f2->frequency, f2->volts, f2->power, EST_TRANS_LAT);
-	}
-
-	return B_OK;
-}
-
-
-static status_t
-est_close(void* cookie)
-{
-	est_cookie *device = (est_cookie*)cookie;
-	free(device);
-	return B_OK;
-}
-
-
-static status_t
-est_free(void* cookie)
-{
-	return B_OK;
-}
-
-
-//	#pragma mark - driver module API
-
-
-static float
-est_support(device_node *parent)
-{
-	// make sure parent is really the ACPI bus manager
-	const char *bus;
-	if (sDeviceManager->get_attr_string(parent, B_DEVICE_BUS, &bus, false))
-		return -1;
-
-	if (strcmp(bus, "acpi"))
-		return 0.0;
-
-	// check whether it's really a cpu Device
-	uint32 deviceType;
-	if (sDeviceManager->get_attr_uint32(parent, ACPI_DEVICE_TYPE_ITEM,
-			&deviceType, false) != B_OK
-		|| deviceType != ACPI_TYPE_PROCESSOR) {
-		return 0.0;
-	}
-
-	// check if cpu support est
-	uint32 cpuNum = 0;
-	system_info sysInfo;
-	if (get_system_info(&sysInfo) != B_OK)
-		return 0.0;
-	TRACE("est: cpu_type: %u vendor %u model %u\n", sysInfo.cpu_type,
-		sysInfo.cpu_type & B_CPU_x86_VENDOR_MASK, sysInfo.cpu_type & 0x00FF);
-	if ((sysInfo.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86)
-		return 0.0;
-
-	// TODO: Make the code SMP safe!
-	if (sysInfo.cpu_count > 1)
-		return 0.0;
-
-	cpuid_info info;
-	if (get_cpuid(&info, 1, cpuNum) != B_OK)
-		return 0.0;
-
-	TRACE("est: extended_features: %i\n", int(info.eax_1.extended_features));
-
-	// check for enhanced speedstep
-	if ((info.eax_1.extended_features & IA32_FEATURE_EXT_EST) == 0)
-		return 0.0;
-
-	TRACE("est: supported\n");
-	return 0.6;
-}
-
-
-static status_t
-est_register_device(device_node *node)
-{
-	device_attr attrs[] = {
-		{ B_DEVICE_PRETTY_NAME, B_STRING_TYPE,
-			{ string: "ACPI Enhanced Speedstep" }},
-		{ NULL }
-	};
-
-	return sDeviceManager->register_node(node, EST_MODULE_NAME, attrs,
-		NULL, NULL);
-}
-
-
-static status_t
-est_init_driver(device_node *node, void **_driverCookie)
-{
-	*_driverCookie = node;
-
-	sFrequencyCondition.Init(NULL, "frequency cv");
-	sCurrentID = -1;
-
-	return B_OK;
-}
-
-
-static void
-est_uninit_driver(void *driverCookie)
-{
-}
-
-
-static status_t
-est_register_child_devices(void *_cookie)
-{
-	device_node *node = (device_node*)_cookie;
-
-	int pathID = sDeviceManager->create_id(EST_PATHID_GENERATOR);
-	if (pathID < 0) {
-		TRACE("est_register_child_devices: couldn't create a path_id\n");
-		return B_ERROR;
-	}
-
-	char name[128];
-	snprintf(name, sizeof(name), EST_BASENAME, pathID);
-
-	return sDeviceManager->publish_device(node, name, EST_DEVICE_MODULE_NAME);
-}
-
-
-static status_t
-est_init_device(void *driverCookie, void **cookie)
-{
-	// driverCookie is the device node
-	*cookie = driverCookie;
-	return B_OK;
-}
-
-
-static void
-est_uninit_device(void *_cookie)
-{
-
-}
-
-
-
-module_dependency module_dependencies[] = {
-	{ B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&sDeviceManager },
-	{}
-};
-
-
-driver_module_info est_driver_module = {
-	{
-		EST_MODULE_NAME,
-		0,
-		NULL
-	},
-
-	est_support,
-	est_register_device,
-	est_init_driver,
-	est_uninit_driver,
-	est_register_child_devices,
-	NULL,	// rescan
-	NULL,	// removed
-};
-
-
-struct device_module_info est_device_module = {
-	{
-		EST_DEVICE_MODULE_NAME,
-		0,
-		NULL
-	},
-
-	est_init_device,
-	est_uninit_device,
-	NULL,
-
-	est_open,
-	est_close,
-	est_free,
-	est_read,
-	est_write,
-	NULL,
-	est_control,
-
-	NULL,
-	NULL
-};
-
-module_info *modules[] = {
-	(module_info *)&est_driver_module,
-	(module_info *)&est_device_module,
-	NULL
-};
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.h b/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.h
deleted file mode 100644
index b51fa9120f..0000000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _EST_H
-#define _EST_H
-
-#include <KernelExport.h>
-#include <ACPI.h>
-
-#include "frequency.h"
-
-// Model Specific Register
-#define MSR_MISC				0x1a0 
-#define MSR_EST_ENABLED			(1<<16) 
-
-
-struct est_cookie {
-	// this three variables are not needed yet but helpfull when extend this
-	// driver to use acpi
-	device_node				*node;
-	acpi_device_module_info	*acpi;
-	acpi_device				acpi_cookie;
-	
-	// array of states don't delete it
-	freq_info*				available_states;
-	uint8					number_states;
-	
-	int32					stop_watching;
-};
-
-
-#endif /* _EST_H */
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.cpp b/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.cpp
deleted file mode 100644
index 0c75901c77..0000000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright 2009, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Clemens Zeidler, haiku@clemens-zeidler.de
- */
-
-
-#include "frequency.h"
-
-#include <arch/x86/arch_cpu.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-void
-est_get_id16(uint16* _id16)
-{
-	*_id16 = x86_read_msr(MSR_GET_FREQ_STATE) & 0xffff;
-}
-
-
-status_t
-est_set_id16(uint16 id16, bool needCheck)
-{
-	uint64 msr;
-
-	// Read the current register, mask out the old, set the new id.
-	msr = x86_read_msr(MSR_GET_FREQ_STATE);
-	msr = (msr & ~0xffff) | id16;
-	x86_write_msr(MSR_SET_FREQ_STATE, msr);
-
-	if (needCheck) {
-		// Wait a short while for the new setting.  XXX Is this necessary?
-		snooze(EST_TRANS_LAT);
-
-		uint16 newID16;
-		est_get_id16(&newID16);
-		if (newID16 != id16)
-			return B_ERROR;
-		TRACE("EST: set frequency ok, id %i\n", id16);
-	}
-	return B_OK;
-}
-
-
-freq_info*
-est_get_current(freq_info* list)
-{
-	// Try a few times to get a valid value.  Sometimes, if the CPU
-	// is in the middle of an asynchronous transition (i.e., P4TCC),
-	// we get a temporary invalid result.
-	for (uint32 i = 0; i < 5; i++) {
-		uint16 id16;
-		est_get_id16(&id16);
-
-		for (freq_info* info = list; info->id != 0; info++) {
-			if (info->id == id16)
-				return info;
-		}
-
-		snooze(100);
-	}
-	return NULL;
-}
-
-
-status_t
-est_get_info(freq_info** _frequencyInfos)
-{
-	uint64 msr = x86_read_msr(MSR_GET_FREQ_STATE);
-	status_t status = est_table_info(msr, _frequencyInfos);
-	if (status != B_OK) {
-		TRACE("EST: Get frequency table from model specific register\n");
-		status = est_msr_info(msr, _frequencyInfos);
-	}
-
-	if (status != B_OK) {
-		TRACE("est: CPU supports Enhanced Speedstep, but is not recognized.\n");
-		return status;
-	}
-
-	return B_OK;
-}
-
-
-status_t
-est_table_info(uint64 msr, freq_info** _frequencyInfos)
-{
-	// Find a table which matches (vendor, id32).
-	system_info info;
-	if (get_system_info(&info) != B_OK)
-		return B_ERROR;
-
-	ss_cpu_info* cpuInfo;
-	uint32 id = msr >> 32;
-	for (cpuInfo = ESTprocs; cpuInfo->id32 != 0; cpuInfo++) {
-		if (cpuInfo->vendor_id == uint32(info.cpu_type & B_CPU_x86_VENDOR_MASK)
-			&& cpuInfo->id32 == id)
-			break;
-	}
-	if (cpuInfo->id32 == 0)
-		return B_ERROR;
-
-	// Make sure the current setpoint is valid.
-	if (est_get_current(cpuInfo->freqtab) == NULL) {
-		TRACE("current setting not found in table\n");
-		return B_ERROR;
-	}
-
-	*_frequencyInfos = cpuInfo->freqtab;
-	return B_OK;
-}
-
-
-bool
-bus_speed_ok(int bus)
-{
-	switch (bus) {
-		case 100:
-		case 133:
-		case 166:
-		case 333:
-			return true;
-		default:
-			return false;
-	}
-}
-
-
-/*!	Flesh out a simple rate table containing the high and low frequencies
-	based on the current clock speed and the upper 32 bits of the MSR.
-*/
-status_t
-est_msr_info(uint64 msr, freq_info** _frequencyInfos)
-{
-	// Figure out the bus clock.
-	system_info info;
-	if (get_system_info(&info) != B_OK)
-		return B_ERROR;
-
-	int32 freq = info.cpu_clock_speed / 1000000;
-	uint16 id = msr >> 32;
-	int32 bus = 0;
-	if (id >> 8)
-		bus = freq / (id >> 8);
-
-	TRACE("est: Guessed bus clock (high) of %d MHz\n", int(bus));
-	if (!bus_speed_ok(bus)) {
-		// We may be running on the low frequency.
-		id = msr >> 48;
-		if (id >> 8)
-			bus = freq / (id >> 8);
-		TRACE("est: Guessed bus clock (low) of %d MHz\n", int(bus));
-		if (!bus_speed_ok(bus))
-			return B_ERROR;
-
-		// Calculate high frequency.
-		id = msr >> 32;
-		freq = ((id >> 8) & 0xff) * bus;
-	}
-
-	// Fill out a new freq table containing just the high and low freqs.
-	freq_info* frequencyInfo = (freq_info*)malloc(sizeof(freq_info) * 3);
-	if (frequencyInfo == NULL)
-		return B_NO_MEMORY;
-
-	memset(frequencyInfo, 0, sizeof(freq_info) * 3);
-
-	// First, the high frequency.
-	int32 volts = id & 0xff;
-	if (volts != 0) {
-		volts <<= 4;
-		volts += 700;
-	}
-	frequencyInfo[0].frequency = freq;
-	frequencyInfo[0].volts = volts;
-	frequencyInfo[0].id = id;
-	frequencyInfo[0].power = CPUFREQ_VAL_UNKNOWN;
-	TRACE("Guessed high setting of %d MHz @ %d Mv\n", int(freq), int(volts));
-
-	// Second, the low frequency.
-	id = msr >> 48;
-	freq = ((id >> 8) & 0xff) * bus;
-	volts = id & 0xff;
-	if (volts != 0) {
-		volts <<= 4;
-		volts += 700;
-	}
-	frequencyInfo[1].frequency = freq;
-	frequencyInfo[1].volts = volts;
-	frequencyInfo[1].id = id;
-	frequencyInfo[1].power = CPUFREQ_VAL_UNKNOWN;
-	TRACE("Guessed low setting of %d MHz @ %d Mv\n", int(freq), int(volts));
-
-	// Table is already terminated due to M_ZERO.
-	*_frequencyInfos = frequencyInfo;
-	return B_OK;
-}
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.h b/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.h
deleted file mode 100644
index 454bc6e2bb..0000000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.h
+++ /dev/null
@@ -1,852 +0,0 @@
-#ifndef FREQ_TABLE_H
-#define FREQ_TABLE_H
-
-#include <OS.h>
-#include <KernelExport.h>
-#include <Errors.h>
-
-#include "device/power_managment.h"
-
-#define TRACE_EST
-#ifdef TRACE_EST
-#	define TRACE(x...) dprintf(x)
-#else
-#	define TRACE(x...)
-#endif
-
-// this code is taken from freeBSD
-
-#define MSR_GET_FREQ_STATE		0x198 
-#define MSR_SET_FREQ_STATE   	0x199
-
-/* Estimate in microseconds of latency for performing a transition. */
-#define EST_TRANS_LAT           1000
-
-/* Identifying characteristics of a processor and supported frequencies. */
-typedef struct {
-	const uint32	vendor_id;
-	uint32			id32;
-	freq_info		*freqtab;
-} ss_cpu_info;
-
-
-status_t est_get_info(freq_info **freqsInfo);
-status_t est_table_info(uint64 msr, freq_info **freqs);
-status_t est_msr_info(uint64 msr, freq_info **freqs);
-
-freq_info* est_get_current(freq_info *freq_list);
-void est_get_id16(uint16 *id16_p);
-status_t est_set_id16(uint16 id16, bool need_check = false);
-
-/* Convert MHz and mV into IDs for passing to the MSR. */
-#define ID16(MHz, mV, bus_clk)                          \
-        (((MHz / bus_clk) << 8) | ((mV ? mV - 700 : 0) >> 4))
-#define ID32(MHz_hi, mV_hi, MHz_lo, mV_lo, bus_clk)     \
-        ((ID16(MHz_lo, mV_lo, bus_clk) << 16) | (ID16(MHz_hi, mV_hi, bus_clk)))
-
-/* Format for storing IDs in our table. */
-#define CPUFREQ_VAL_UNKNOWN (-1)
-#define CPU_VENDOR_INTEL	B_CPU_INTEL_x86
-#define CPU_VENDOR_CENTAUR	B_CPU_VIA_IDT_x86
-
-#define FREQ_INFO_PWR(MHz, mV, bus_clk, mW)             \
-        { MHz, mV, ID16(MHz, mV, bus_clk), mW }
-#define FREQ_INFO(MHz, mV, bus_clk)                     \
-        FREQ_INFO_PWR(MHz, mV, bus_clk, CPUFREQ_VAL_UNKNOWN)
-#define INTEL(tab, zhi, vhi, zlo, vlo, bus_clk)         \
-        { CPU_VENDOR_INTEL, ID32(zhi, vhi, zlo, vlo, bus_clk), tab }
-#define CENTAUR(tab, zhi, vhi, zlo, vlo, bus_clk)       \
-        { CPU_VENDOR_CENTAUR, ID32(zhi, vhi, zlo, vlo, bus_clk), tab }
-
-/* Default bus clock value for Centrino processors. */
-#define INTEL_BUS_CLK           100
-
-/*
- * Frequency (MHz) and voltage (mV) settings.  Data from the
- * Intel Pentium M Processor Datasheet (Order Number 252612), Table 5.
- *
- * Dothan processors have multiple VID#s with different settings for
- * each VID#.  Since we can't uniquely identify this info
- * without undisclosed methods from Intel, we can't support newer
- * processors with this table method.  If ACPI Px states are supported,
- * we get info from them.
- */
-static freq_info PM17_130[] = {
-        /* 130nm 1.70GHz Pentium M */
-        FREQ_INFO(1700, 1484, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1004, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM16_130[] = {
-        /* 130nm 1.60GHz Pentium M */
-        FREQ_INFO(1600, 1484, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1420, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1164, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM15_130[] = {
-        /* 130nm 1.50GHz Pentium M */
-        FREQ_INFO(1500, 1484, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1452, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1356, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1228, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM14_130[] = {
-        /* 130nm 1.40GHz Pentium M */
-        FREQ_INFO(1400, 1484, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1436, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1308, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1180, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM13_130[] = {
-        /* 130nm 1.30GHz Pentium M */
-        FREQ_INFO(1300, 1388, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1356, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1292, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1260, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM13_LV_130[] = {
-        /* 130nm 1.30GHz Low Voltage Pentium M */
-        FREQ_INFO(1300, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1100, 1100, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1020, INTEL_BUS_CLK),
-        FREQ_INFO( 900, 1004, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  988, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM12_LV_130[] = {
-        /* 130 nm 1.20GHz Low Voltage Pentium M */
-        FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1100, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
-        FREQ_INFO( 900, 1020, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1004, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM11_LV_130[] = {
-        /* 130 nm 1.10GHz Low Voltage Pentium M */
-        FREQ_INFO(1100, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1164, INTEL_BUS_CLK),
-        FREQ_INFO( 900, 1100, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  956, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM11_ULV_130[] = {
-        /* 130 nm 1.10GHz Ultra Low Voltage Pentium M */
-        FREQ_INFO(1100, 1004, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  988, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  972, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  956, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  844, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM10_ULV_130[] = {
-        /* 130 nm 1.00GHz Ultra Low Voltage Pentium M */
-        FREQ_INFO(1000, 1004, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  988, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  972, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  844, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-
-/*
- * Data from "Intel Pentium M Processor on 90nm Process with
- * 2-MB L2 Cache Datasheet", Order Number 302189, Table 5.
- */
-static freq_info PM_765A_90[] = {
-        /* 90 nm 2.10GHz Pentium M, VID #A */
-        FREQ_INFO(2100, 1340, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_765B_90[] = {
-        /* 90 nm 2.10GHz Pentium M, VID #B */
-        FREQ_INFO(2100, 1324, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1260, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_765C_90[] = {
-        /* 90 nm 2.10GHz Pentium M, VID #C */
-        FREQ_INFO(2100, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_765E_90[] = {
-        /* 90 nm 2.10GHz Pentium M, VID #E */
-        FREQ_INFO(2100, 1356, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1292, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1196, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_755A_90[] = {
-        /* 90 nm 2.00GHz Pentium M, VID #A */
-        FREQ_INFO(2000, 1340, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1292, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1196, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_755B_90[] = {
-        /* 90 nm 2.00GHz Pentium M, VID #B */
-        FREQ_INFO(2000, 1324, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_755C_90[] = {
-        /* 90 nm 2.00GHz Pentium M, VID #C */
-        FREQ_INFO(2000, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_755D_90[] = {
-        /* 90 nm 2.00GHz Pentium M, VID #D */
-        FREQ_INFO(2000, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1800, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1196, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_745A_90[] = {
-        /* 90 nm 1.80GHz Pentium M, VID #A */
-        FREQ_INFO(1800, 1340, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1292, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_745B_90[] = {
-        /* 90 nm 1.80GHz Pentium M, VID #B */
-        FREQ_INFO(1800, 1324, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_745C_90[] = {
-        /* 90 nm 1.80GHz Pentium M, VID #C */
-        FREQ_INFO(1800, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1260, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_745D_90[] = {
-        /* 90 nm 1.80GHz Pentium M, VID #D */
-        FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_735A_90[] = {
-        /* 90 nm 1.70GHz Pentium M, VID #A */
-        FREQ_INFO(1700, 1340, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_735B_90[] = {
-        /* 90 nm 1.70GHz Pentium M, VID #B */
-        FREQ_INFO(1700, 1324, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_735C_90[] = {
-        /* 90 nm 1.70GHz Pentium M, VID #C */
-        FREQ_INFO(1700, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_735D_90[] = {
-        /* 90 nm 1.70GHz Pentium M, VID #D */
-        FREQ_INFO(1700, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_725A_90[] = {
-        /* 90 nm 1.60GHz Pentium M, VID #A */
-        FREQ_INFO(1600, 1340, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1132, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_725B_90[] = {
-        /* 90 nm 1.60GHz Pentium M, VID #B */
-        FREQ_INFO(1600, 1324, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1260, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1196, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1132, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_725C_90[] = {
-        /* 90 nm 1.60GHz Pentium M, VID #C */
-        FREQ_INFO(1600, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1244, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_725D_90[] = {
-        /* 90 nm 1.60GHz Pentium M, VID #D */
-        FREQ_INFO(1600, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_715A_90[] = {
-        /* 90 nm 1.50GHz Pentium M, VID #A */
-        FREQ_INFO(1500, 1340, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1228, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1148, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_715B_90[] = {
-        /* 90 nm 1.50GHz Pentium M, VID #B */
-        FREQ_INFO(1500, 1324, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1148, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_715C_90[] = {
-        /* 90 nm 1.50GHz Pentium M, VID #C */
-        FREQ_INFO(1500, 1308, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1212, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1132, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_715D_90[] = {
-        /* 90 nm 1.50GHz Pentium M, VID #D */
-        FREQ_INFO(1500, 1276, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_778_90[] = {
-        /* 90 nm 1.60GHz Low Voltage Pentium M */
-        FREQ_INFO(1600, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1500, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1100, INTEL_BUS_CLK),
-        FREQ_INFO(1300, 1084, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1068, INTEL_BUS_CLK),
-        FREQ_INFO(1100, 1052, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 900, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_758_90[] = {
-        /* 90 nm 1.50GHz Low Voltage Pentium M */
-        FREQ_INFO(1500, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1400, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1300, 1100, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1084, INTEL_BUS_CLK),
-        FREQ_INFO(1100, 1068, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 900, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_738_90[] = {
-        /* 90 nm 1.40GHz Low Voltage Pentium M */
-        FREQ_INFO(1400, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1300, 1116, INTEL_BUS_CLK),
-        FREQ_INFO(1200, 1100, INTEL_BUS_CLK),
-        FREQ_INFO(1100, 1068, INTEL_BUS_CLK),
-        FREQ_INFO(1000, 1052, INTEL_BUS_CLK),
-        FREQ_INFO( 900, 1036, INTEL_BUS_CLK),
-        FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  988, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_773G_90[] = {
-        /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #G */
-        FREQ_INFO(1300,  956, INTEL_BUS_CLK),
-        FREQ_INFO(1200,  940, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  924, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  908, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_773H_90[] = {
-        /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #H */
-        FREQ_INFO(1300,  940, INTEL_BUS_CLK),
-        FREQ_INFO(1200,  924, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_773I_90[] = {
-        /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #I */
-        FREQ_INFO(1300,  924, INTEL_BUS_CLK),
-        FREQ_INFO(1200,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_773J_90[] = {
-        /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #J */
-        FREQ_INFO(1300,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1200,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_773K_90[] = {
-        /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #K */
-        FREQ_INFO(1300,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1200,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  876, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_773L_90[] = {
-        /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #L */
-        FREQ_INFO(1300,  876, INTEL_BUS_CLK),
-        FREQ_INFO(1200,  876, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  860, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_753G_90[] = {
-        /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #G */
-        FREQ_INFO(1200,  956, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  940, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  908, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_753H_90[] = {
-        /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #H */
-        FREQ_INFO(1200,  940, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  924, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  908, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_753I_90[] = {
-        /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #I */
-        FREQ_INFO(1200,  924, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_753J_90[] = {
-        /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #J */
-        FREQ_INFO(1200,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_753K_90[] = {
-        /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #K */
-        FREQ_INFO(1200,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_753L_90[] = {
-        /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #L */
-        FREQ_INFO(1200,  876, INTEL_BUS_CLK),
-        FREQ_INFO(1100,  876, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-
-static freq_info PM_733JG_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #G */
-        FREQ_INFO(1100,  956, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  940, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  908, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JH_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #H */
-        FREQ_INFO(1100,  940, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  924, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JI_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #I */
-        FREQ_INFO(1100,  924, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  908, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JJ_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #J */
-        FREQ_INFO(1100,  908, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JK_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #K */
-        FREQ_INFO(1100,  892, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JL_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #L */
-        FREQ_INFO(1100,  876, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  860, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  844, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-};
-static freq_info PM_733_90[] = {
-        /* 90 nm 1.10GHz Ultra Low Voltage Pentium M */
-        FREQ_INFO(1100,  940, INTEL_BUS_CLK),
-        FREQ_INFO(1000,  924, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  892, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-static freq_info PM_723_90[] = {
-        /* 90 nm 1.00GHz Ultra Low Voltage Pentium M */
-        FREQ_INFO(1000,  940, INTEL_BUS_CLK),
-        FREQ_INFO( 900,  908, INTEL_BUS_CLK),
-        FREQ_INFO( 800,  876, INTEL_BUS_CLK),
-        FREQ_INFO( 600,  812, INTEL_BUS_CLK),
-        FREQ_INFO(   0,    0, 1),
-};
-
-/*
- * VIA C7-M 500 MHz FSB, 400 MHz FSB, and ULV variants.
- * Data from the "VIA C7-M Processor BIOS Writer's Guide (v2.17)" datasheet.
- */
-static freq_info C7M_795[] = {
-        /* 2.00GHz Centaur C7-M 533 Mhz FSB */
-        FREQ_INFO_PWR(2000, 1148, 133, 20000),
-        FREQ_INFO_PWR(1867, 1132, 133, 18000),
-        FREQ_INFO_PWR(1600, 1100, 133, 15000),
-        FREQ_INFO_PWR(1467, 1052, 133, 13000),
-        FREQ_INFO_PWR(1200, 1004, 133, 10000),
-        FREQ_INFO_PWR( 800,  844, 133,  7000),
-        FREQ_INFO_PWR( 667,  844, 133,  6000),
-        FREQ_INFO_PWR( 533,  844, 133,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_785[] = {
-        /* 1.80GHz Centaur C7-M 533 Mhz FSB */
-        FREQ_INFO_PWR(1867, 1148, 133, 18000),
-        FREQ_INFO_PWR(1600, 1100, 133, 15000),
-        FREQ_INFO_PWR(1467, 1052, 133, 13000),
-        FREQ_INFO_PWR(1200, 1004, 133, 10000),
-        FREQ_INFO_PWR( 800,  844, 133,  7000),
-        FREQ_INFO_PWR( 667,  844, 133,  6000),
-        FREQ_INFO_PWR( 533,  844, 133,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_765[] = {
-        /* 1.60GHz Centaur C7-M 533 Mhz FSB */
-        FREQ_INFO_PWR(1600, 1084, 133, 15000),
-        FREQ_INFO_PWR(1467, 1052, 133, 13000),
-        FREQ_INFO_PWR(1200, 1004, 133, 10000),
-        FREQ_INFO_PWR( 800,  844, 133,  7000),
-        FREQ_INFO_PWR( 667,  844, 133,  6000),
-        FREQ_INFO_PWR( 533,  844, 133,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-
-static freq_info C7M_794[] = {
-        /* 2.00GHz Centaur C7-M 400 Mhz FSB */
-        FREQ_INFO_PWR(2000, 1148, 100, 20000),
-        FREQ_INFO_PWR(1800, 1132, 100, 18000),
-        FREQ_INFO_PWR(1600, 1100, 100, 15000),
-        FREQ_INFO_PWR(1400, 1052, 100, 13000),
-        FREQ_INFO_PWR(1000, 1004, 100, 10000),
-        FREQ_INFO_PWR( 800,  844, 100,  7000),
-        FREQ_INFO_PWR( 600,  844, 100,  6000),
-        FREQ_INFO_PWR( 400,  844, 100,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_784[] = {
-        /* 1.80GHz Centaur C7-M 400 Mhz FSB */
-        FREQ_INFO_PWR(1800, 1148, 100, 18000),
-        FREQ_INFO_PWR(1600, 1100, 100, 15000),
-        FREQ_INFO_PWR(1400, 1052, 100, 13000),
-        FREQ_INFO_PWR(1000, 1004, 100, 10000),
-        FREQ_INFO_PWR( 800,  844, 100,  7000),
-        FREQ_INFO_PWR( 600,  844, 100,  6000),
-        FREQ_INFO_PWR( 400,  844, 100,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_764[] = {
-        /* 1.60GHz Centaur C7-M 400 Mhz FSB */
-        FREQ_INFO_PWR(1600, 1084, 100, 15000),
-        FREQ_INFO_PWR(1400, 1052, 100, 13000),
-        FREQ_INFO_PWR(1000, 1004, 100, 10000),
-        FREQ_INFO_PWR( 800,  844, 100,  7000),
-        FREQ_INFO_PWR( 600,  844, 100,  6000),
-        FREQ_INFO_PWR( 400,  844, 100,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_754[] = {
-        /* 1.50GHz Centaur C7-M 400 Mhz FSB */
-        FREQ_INFO_PWR(1500, 1004, 100, 12000),
-        FREQ_INFO_PWR(1400,  988, 100, 11000),
-        FREQ_INFO_PWR(1000,  940, 100,  9000),
-        FREQ_INFO_PWR( 800,  844, 100,  7000),
-        FREQ_INFO_PWR( 600,  844, 100,  6000),
-        FREQ_INFO_PWR( 400,  844, 100,  5000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_771[] = {
-        /* 1.20GHz Centaur C7-M 400 Mhz FSB */
-        FREQ_INFO_PWR(1200,  860, 100,  7000),
-        FREQ_INFO_PWR(1000,  860, 100,  6000),
-        FREQ_INFO_PWR( 800,  844, 100,  5500),
-        FREQ_INFO_PWR( 600,  844, 100,  5000),
-        FREQ_INFO_PWR( 400,  844, 100,  4000),
-        FREQ_INFO(0, 0, 1),
-};
-
-static freq_info C7M_775_ULV[] = {
-        /* 1.50GHz Centaur C7-M ULV */
-        FREQ_INFO_PWR(1500,  956, 100,  7500),
-        FREQ_INFO_PWR(1400,  940, 100,  6000),
-        FREQ_INFO_PWR(1000,  860, 100,  5000),
-        FREQ_INFO_PWR( 800,  828, 100,  2800),
-        FREQ_INFO_PWR( 600,  796, 100,  2500),
-        FREQ_INFO_PWR( 400,  796, 100,  2000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_772_ULV[] = {
-        /* 1.20GHz Centaur C7-M ULV */
-        FREQ_INFO_PWR(1200,  844, 100,  5000),
-        FREQ_INFO_PWR(1000,  844, 100,  4000),
-        FREQ_INFO_PWR( 800,  828, 100,  2800),
-        FREQ_INFO_PWR( 600,  796, 100,  2500),
-        FREQ_INFO_PWR( 400,  796, 100,  2000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_779_ULV[] = {
-        /* 1.00GHz Centaur C7-M ULV */
-        FREQ_INFO_PWR(1000,  796, 100,  3500),
-        FREQ_INFO_PWR( 800,  796, 100,  2800),
-        FREQ_INFO_PWR( 600,  796, 100,  2500),
-        FREQ_INFO_PWR( 400,  796, 100,  2000),
-        FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_770_ULV[] = {
-        /* 1.00GHz Centaur C7-M ULV */
-        FREQ_INFO_PWR(1000,  844, 100,  5000),
-        FREQ_INFO_PWR( 800,  796, 100,  2800),
-        FREQ_INFO_PWR( 600,  796, 100,  2500),
-        FREQ_INFO_PWR( 400,  796, 100,  2000),
-        FREQ_INFO(0, 0, 1),
-};
-
-static ss_cpu_info ESTprocs[] = {
-        INTEL(PM17_130,         1700, 1484, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM16_130,         1600, 1484, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM15_130,         1500, 1484, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM14_130,         1400, 1484, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM13_130,         1300, 1388, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM13_LV_130,      1300, 1180, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM12_LV_130,      1200, 1180, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM11_LV_130,      1100, 1180, 600, 956, INTEL_BUS_CLK),
-        INTEL(PM11_ULV_130,     1100, 1004, 600, 844, INTEL_BUS_CLK),
-        INTEL(PM10_ULV_130,     1000, 1004, 600, 844, INTEL_BUS_CLK),
-        INTEL(PM_765A_90,       2100, 1340, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_765B_90,       2100, 1324, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_765C_90,       2100, 1308, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_765E_90,       2100, 1356, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_755A_90,       2000, 1340, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_755B_90,       2000, 1324, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_755C_90,       2000, 1308, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_755D_90,       2000, 1276, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_745A_90,       1800, 1340, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_745B_90,       1800, 1324, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_745C_90,       1800, 1308, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_745D_90,       1800, 1276, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_735A_90,       1700, 1340, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_735B_90,       1700, 1324, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_735C_90,       1700, 1308, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_735D_90,       1700, 1276, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_725A_90,       1600, 1340, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_725B_90,       1600, 1324, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_725C_90,       1600, 1308, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_725D_90,       1600, 1276, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_715A_90,       1500, 1340, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_715B_90,       1500, 1324, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_715C_90,       1500, 1308, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_715D_90,       1500, 1276, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_778_90,        1600, 1116, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_758_90,        1500, 1116, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_738_90,        1400, 1116, 600, 988, INTEL_BUS_CLK),
-        INTEL(PM_773G_90,       1300,  956, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_773H_90,       1300,  940, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_773I_90,       1300,  924, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_773J_90,       1300,  908, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_773K_90,       1300,  892, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_773L_90,       1300,  876, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_753G_90,       1200,  956, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_753H_90,       1200,  940, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_753I_90,       1200,  924, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_753J_90,       1200,  908, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_753K_90,       1200,  892, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_753L_90,       1200,  876, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733JG_90,      1100,  956, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733JH_90,      1100,  940, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733JI_90,      1100,  924, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733JJ_90,      1100,  908, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733JK_90,      1100,  892, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733JL_90,      1100,  876, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_733_90,        1100,  940, 600, 812, INTEL_BUS_CLK),
-        INTEL(PM_723_90,        1000,  940, 600, 812, INTEL_BUS_CLK),
-
-        CENTAUR(C7M_795,        2000, 1148, 533, 844, 133),
-        CENTAUR(C7M_794,        2000, 1148, 400, 844, 100),
-        CENTAUR(C7M_785,        1867, 1148, 533, 844, 133),
-        CENTAUR(C7M_784,        1800, 1148, 400, 844, 100),
-        CENTAUR(C7M_765,        1600, 1084, 533, 844, 133),
-        CENTAUR(C7M_764,        1600, 1084, 400, 844, 100),
-        CENTAUR(C7M_754,        1500, 1004, 400, 844, 100),
-        CENTAUR(C7M_775_ULV,    1500,  956, 400, 796, 100),
-        CENTAUR(C7M_771,        1200,  860, 400, 844, 100),
-        CENTAUR(C7M_772_ULV,    1200,  844, 400, 796, 100),
-        CENTAUR(C7M_779_ULV,    1000,  796, 400, 796, 100),
-        CENTAUR(C7M_770_ULV,    1000,  844, 400, 796, 100),
-        { 0, 0, NULL },
-};
-
-#endif
-