diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 19:15:48 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 19:15:48 +0000 |
| commit | ab2f75ce55ef6f903348026271e30796f016851f (patch) | |
| tree | 8e019d460e92ee6ac2b2ea54aa0b93770bf933ef /drivers/cpufreq/gx-suspmod.c | |
| parent | f56b71f5d5a3944acdcb0e5e1739574d95ddf61a (diff) | |
| parent | da5a70f3519fd6f73ece3eea261a861c9a4d6bbd (diff) | |
| download | blackbird-op-linux-ab2f75ce55ef6f903348026271e30796f016851f.tar.gz blackbird-op-linux-ab2f75ce55ef6f903348026271e30796f016851f.zip | |
Merge branch 'depends/driver-core' into ux500/dt
Conflicts:
drivers/base/cpu.c
Diffstat (limited to 'drivers/cpufreq/gx-suspmod.c')
| -rw-r--r-- | drivers/cpufreq/gx-suspmod.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/cpufreq/gx-suspmod.c b/drivers/cpufreq/gx-suspmod.c index ffe1f2c92ed3..456bee058fe6 100644 --- a/drivers/cpufreq/gx-suspmod.c +++ b/drivers/cpufreq/gx-suspmod.c @@ -82,6 +82,7 @@ #include <linux/errno.h> #include <linux/slab.h> +#include <asm/cpu_device_id.h> #include <asm/processor-cyrix.h> /* PCI config registers, all at F0 */ @@ -171,6 +172,7 @@ static struct pci_device_id gx_chipset_tbl[] __initdata = { { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5510), }, { 0, }, }; +MODULE_DEVICE_TABLE(pci, gx_chipset_tbl); static void gx_write_byte(int reg, int value) { @@ -185,13 +187,6 @@ static __init struct pci_dev *gx_detect_chipset(void) { struct pci_dev *gx_pci = NULL; - /* check if CPU is a MediaGX or a Geode. */ - if ((boot_cpu_data.x86_vendor != X86_VENDOR_NSC) && - (boot_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) { - pr_debug("error: no MediaGX/Geode processor found!\n"); - return NULL; - } - /* detect which companion chip is used */ for_each_pci_dev(gx_pci) { if ((pci_match_id(gx_chipset_tbl, gx_pci)) != NULL) |
