linux-next: manual merge of the cpufreq tree with the acpi tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the cpufreq tree got a conflict in
include/acpi/processor.h between commit
d81c45e1c9369855901420f79114852eba2ea16a ("ACPI: Notify the _PPC
evaluation status to the platform") from the acpi tree and commit
b02d803d0fa3a395ba32bc5e5e3e7a3385ca7237 ("[CPUFREQ] Introduce bios_limit
per cpu cpufreq sysfs interface") from the cpufreq tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

By the way, Dave, Thomas, shouldn't the second version of
acpi_processor_get_bios_limit() in include/acpi/processor.h introduced by
the above cpufreq tree patch be "static inline"?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/acpi/processor.h
index a920237,e7454b3..0000000
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@@ -294,7 -294,8 +294,8 @@@ static inline void acpi_processor_ffh_c
  #ifdef CONFIG_CPU_FREQ
  void acpi_processor_ppc_init(void);
  void acpi_processor_ppc_exit(void);
 -int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
 +int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
+ extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
  #else
  static inline void acpi_processor_ppc_init(void)
  {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/