Hi, Ralf, Can this patch be merged? or does it have problems to be fix? Huacai On Wed, Oct 7, 2015 at 2:08 PM, Huacai Chen <chenhc@xxxxxxxxxx> wrote: > SB700/SB710/SB800 chipset ACPI code is mostly Loongson-3 specific > routines rather than a "platform driver". > > Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx> > --- > arch/mips/loongson64/loongson-3/Makefile | 2 +- > .../platform/mips => arch/mips/loongson64/loongson-3}/acpi_init.c | 0 > drivers/platform/mips/Kconfig | 4 ---- > drivers/platform/mips/Makefile | 1 - > 4 files changed, 1 insertion(+), 6 deletions(-) > rename {drivers/platform/mips => arch/mips/loongson64/loongson-3}/acpi_init.c (100%) > > diff --git a/arch/mips/loongson64/loongson-3/Makefile b/arch/mips/loongson64/loongson-3/Makefile > index 622fead..44bc148 100644 > --- a/arch/mips/loongson64/loongson-3/Makefile > +++ b/arch/mips/loongson64/loongson-3/Makefile > @@ -1,7 +1,7 @@ > # > # Makefile for Loongson-3 family machines > # > -obj-y += irq.o cop2-ex.o platform.o > +obj-y += irq.o cop2-ex.o platform.o acpi_init.o > > obj-$(CONFIG_SMP) += smp.o > > diff --git a/drivers/platform/mips/acpi_init.c b/arch/mips/loongson64/loongson-3/acpi_init.c > similarity index 100% > rename from drivers/platform/mips/acpi_init.c > rename to arch/mips/loongson64/loongson-3/acpi_init.c > diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig > index 125e569..b3ae30a 100644 > --- a/drivers/platform/mips/Kconfig > +++ b/drivers/platform/mips/Kconfig > @@ -15,10 +15,6 @@ menuconfig MIPS_PLATFORM_DEVICES > > if MIPS_PLATFORM_DEVICES > > -config MIPS_ACPI > - bool > - default y if LOONGSON_MACH3X > - > config CPU_HWMON > tristate "Loongson CPU HWMon Driver" > depends on LOONGSON_MACH3X > diff --git a/drivers/platform/mips/Makefile b/drivers/platform/mips/Makefile > index 4341284..8dfd039 100644 > --- a/drivers/platform/mips/Makefile > +++ b/drivers/platform/mips/Makefile > @@ -1,2 +1 @@ > -obj-$(CONFIG_MIPS_ACPI) += acpi_init.o > obj-$(CONFIG_CPU_HWMON) += cpu_hwmon.o > -- > 2.4.6 > > > > >