diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-05 10:16:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-05 10:16:50 +0000 |
| commit | a8eb5f1e4b10d8b7992ed0e6c0915687339201c3 (patch) | |
| tree | 69dbf24ffe53feb88b2189d22f6092314daa8231 /drivers/cpufreq | |
| parent | 302774e6db8e9845bf065a781237a2bb808186bb (diff) | |
| parent | dffe2a3eed105c631500778dfaba0998d7bf8512 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts (add/add):
drivers/input/evdev.c
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/highbank-cpufreq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/highbank-cpufreq.c b/drivers/cpufreq/highbank-cpufreq.c index b61b5a3fad6..8c4771da1b8 100644 --- a/drivers/cpufreq/highbank-cpufreq.c +++ b/drivers/cpufreq/highbank-cpufreq.c @@ -66,7 +66,8 @@ static int hb_cpufreq_driver_init(void) struct device_node *np; int ret; - if (!of_machine_is_compatible("calxeda,highbank")) + if ((!of_machine_is_compatible("calxeda,highbank")) && + (!of_machine_is_compatible("calxeda,ecx-2000"))) return -ENODEV; for_each_child_of_node(of_find_node_by_path("/cpus"), np) |