diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-10 13:29:39 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-10 13:29:39 -0700 |
| commit | 962393f1adefe4b3be8f63409342e0ab34a5b162 (patch) | |
| tree | 2dd2477f992dc60204fa1104eea9beca5e6f9596 /drivers/base/cpu.c | |
| parent | 070565aed13c16e108f35bcedb8ad22782683735 (diff) | |
| parent | ceec4d230630127c478f33ae4c81ad7992a5de78 (diff) | |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.09-android
* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
net: sysctl_net_core: delete unused variable
usb: gadget: configfs: fix unused variable warnings
net: PPPoPNS: Remove length argument from data_ready
usb: gadget: function: fix unused function warnings
android: configs: base: enable Android gadget functions
usb: gadget: audio_source function depends on SND_PCM
tcp: Silence warning: ‘in’ may be used uninitialized
drivers/base: cpu: fix CPU_AUTOPROBE
of/fdt: fix build warnings in early_init_dt_scan_chosen()
Diffstat (limited to 'drivers/base/cpu.c')
| -rw-r--r-- | drivers/base/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 335e9efc7872..8a38bf8c792f 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -346,7 +346,7 @@ int register_cpu(struct cpu *cpu, int num) cpu->dev.offline_disabled = !cpu->hotpluggable; cpu->dev.offline = !cpu_online(num); cpu->dev.of_node = of_get_cpu_node(num, NULL); -#ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE +#ifdef CONFIG_HAVE_CPU_AUTOPROBE cpu->dev.bus->uevent = cpu_uevent; #endif cpu->dev.groups = common_cpu_attr_groups; |