Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 712fbdd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

parents b25dd284 986632fd

arch/ia64/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -383,6 +383,12 @@ source "drivers/acpi/Kconfig" 


endif



if PM



source "arch/ia64/kernel/cpufreq/Kconfig"



endif



endmenu



if !IA64_HP_SIM

arch/ia64/hp/sim/boot/fw-emu.c

+0 −11
Original line number Diff line number Diff line
@@ -237,17 +237,6 @@ sal_emulator (long index, unsigned long in1, unsigned long in2, 
	return ((struct sal_ret_values) {status, r9, r10, r11});

}





/*

 * This is here to work around a bug in egcs-1.1.1b that causes the

 * compiler to crash (seems like a bug in the new alias analysis code.

 */

void *

id (long addr)

{

	return (void *) addr;

}



struct ia64_boot_param *

sys_fw_init (const char *args, int arglen)

{

arch/ia64/ia32/ia32_signal.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <asm/uaccess.h>

#include <asm/rse.h>

#include <asm/sigcontext.h>

#include <asm/segment.h>



#include "ia32priv.h"

arch/ia64/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_SMP) += smp.o smpboot.o domain.o 
obj-$(CONFIG_NUMA)		+= numa.o

obj-$(CONFIG_PERFMON)		+= perfmon_default_smpl.o

obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o

obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o

obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o

arch/ia64/kernel/cpufreq/Kconfig

0 → 100644
+29 −0
Original line number Diff line number Diff line 


#

# CPU Frequency scaling

#



menu "CPU Frequency scaling"



source "drivers/cpufreq/Kconfig"



if CPU_FREQ



comment "CPUFreq processor drivers"



config IA64_ACPI_CPUFREQ

	tristate "ACPI Processor P-States driver"

	select CPU_FREQ_TABLE

	depends on ACPI_PROCESSOR

	help

	This driver adds a CPUFreq driver which utilizes the ACPI

	Processor Performance States.



	For details, take a look at <file:Documentation/cpu-freq/>.



	If in doubt, say N.



endif   # CPU_FREQ



endmenu