diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /arch/ppc/syslib/Makefile | |
| parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/ppc/syslib/Makefile')
| -rw-r--r-- | arch/ppc/syslib/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index dca23f2ef851..d84f04666972 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
| @@ -45,7 +45,6 @@ obj-$(CONFIG_EBONY) += pci_auto.o todc_time.o | |||
| 45 | obj-$(CONFIG_EV64260) += todc_time.o pci_auto.o | 45 | obj-$(CONFIG_EV64260) += todc_time.o pci_auto.o |
| 46 | obj-$(CONFIG_EV64360) += todc_time.o | 46 | obj-$(CONFIG_EV64360) += todc_time.o |
| 47 | obj-$(CONFIG_CHESTNUT) += mv64360_pic.o pci_auto.o | 47 | obj-$(CONFIG_CHESTNUT) += mv64360_pic.o pci_auto.o |
| 48 | obj-$(CONFIG_GEMINI) += open_pic.o | ||
| 49 | obj-$(CONFIG_GT64260) += gt64260_pic.o | 48 | obj-$(CONFIG_GT64260) += gt64260_pic.o |
| 50 | obj-$(CONFIG_LOPEC) += pci_auto.o todc_time.o | 49 | obj-$(CONFIG_LOPEC) += pci_auto.o todc_time.o |
| 51 | obj-$(CONFIG_HDPU) += pci_auto.o | 50 | obj-$(CONFIG_HDPU) += pci_auto.o |