On Tue, May 24, 2011 at 8:59 PM, Rafael J. Wysocki <rjw@xxxxxxx> wrote: > On Tuesday, May 24, 2011, Wanlong Gao wrote: >> >> > On Tue, May 24, 2011 at 08:19:18PM +0800, Pengfei Zhang wrote: >> > >> > > Remove the resume and shutdown of i8259A from the sysdev_class >> > > to the syscore_ops since these members had removed from the >> > > structure sysdev_class. >> > >> > I don't see why one would want to want to first call >> > register_syscore_ops >> > then sysdev_class_register and sysdev_register? >> > >> Hi Ralf: >> If these not moved to syscore_ops, building will get error. >> >> Hi Thomas: >> Does you mean that we can just remove the sysfs entry now ? > > I had the appended patch in my tree before the merge window started, > but it conflicted with analogous changes in the MIPS tree, so I had > dropped it. Was it a mistake? > Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> > Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx> > Acked-and-tested-by: Lars-Peter Clausen <lars@xxxxxxxxxx> > --- > arch/mips/alchemy/common/dbdma.c | 92 +++++++++++---------------------------- > arch/mips/alchemy/common/irq.c | 62 +++++++++----------------- I took care of these two, they were the reason for the conflict in -next. Manuel
