mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms [ARM] Export smp_call_function() [ARM] Add PM_LEGACY defaults
This commit is contained in:
commit
af768c6711
13 changed files with 38 additions and 16 deletions
|
|
@ -184,6 +184,7 @@ CONFIG_BINFMT_ELF=y
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
# CONFIG_APM is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
# CONFIG_APM is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -208,6 +208,7 @@ CONFIG_BINFMT_MISC=m
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
CONFIG_APM=y
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
# CONFIG_APM is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -190,6 +190,7 @@ CONFIG_BINFMT_ELF=y
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
# CONFIG_APM is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -182,6 +182,7 @@ CONFIG_BINFMT_AOUT=m
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
# CONFIG_APM is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ CONFIG_BINFMT_AOUT=y
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
CONFIG_APM=m
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -190,6 +190,7 @@ CONFIG_BINFMT_AOUT=y
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
CONFIG_APM=y
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ CONFIG_BINFMT_MISC=m
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
CONFIG_APM=y
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@ CONFIG_BINFMT_MISC=m
|
|||
# Power management options
|
||||
#
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_LEGACY is not set
|
||||
CONFIG_APM=y
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -451,6 +451,7 @@ int smp_call_function(void (*func)(void *info), void *info, int retry,
|
|||
return smp_call_function_on_cpu(func, info, retry, wait,
|
||||
cpu_online_map);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(smp_call_function);
|
||||
|
||||
void show_ipi_list(struct seq_file *p)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue