diff options
| -rw-r--r-- | arch/ia64/kernel/Makefile | 5 | ||||
| -rw-r--r-- | arch/ia64/kernel/acpi-processor.c (renamed from arch/ia64/kernel/cpufreq/acpi-processor.c) | 0 | ||||
| -rw-r--r-- | arch/ia64/kernel/cpufreq/Makefile | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 307514f..09a0dbc 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile @@ -13,6 +13,11 @@ obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o + +ifneq ($(CONFIG_ACPI_PROCESSOR),) +obj-y += acpi-processor.o +endif + obj-$(CONFIG_IA64_PALINFO) += palinfo.o obj-$(CONFIG_IOSAPIC) += iosapic.o obj-$(CONFIG_MODULES) += module.o diff --git a/arch/ia64/kernel/cpufreq/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c index e683630..e683630 100644 --- a/arch/ia64/kernel/cpufreq/acpi-processor.c +++ b/arch/ia64/kernel/acpi-processor.c diff --git a/arch/ia64/kernel/cpufreq/Makefile b/arch/ia64/kernel/cpufreq/Makefile index 6426483..4838f2a 100644 --- a/arch/ia64/kernel/cpufreq/Makefile +++ b/arch/ia64/kernel/cpufreq/Makefile @@ -1,6 +1,2 @@ obj-$(CONFIG_IA64_ACPI_CPUFREQ) += acpi-cpufreq.o -ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += acpi-processor.o -endif - |
