diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2005-12-01 18:16:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-05 17:24:45 -0500 |
| commit | c82e6abfb3182c84d0204b178363086b09881a4a (patch) | |
| tree | 98350198b1b963a5c182348982cadf90d8696025 /arch/ia64/kernel | |
| parent | 05131ecc99ea9da7f45ba3058fe8a2c1d0ceeab8 (diff) | |
[ACPI] IA64 ZX1 buildfix for _PDC patch
http://bugzilla.kernel.org/show_bug.cgi?id=5483
ZX1 config doesn't include cpufreq, so move move acpi-processor.c
up out of ia64/cpufreq directory.
no functional changes
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
| -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 307514f7a28..09a0dbc17fb 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 e683630c8ce..e683630c8ce 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 642648361ed..4838f2a57c7 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 - |