Re: [PATCH] vt/suspend: cleanup #if defined uglyness and fix compile error

[Rafael J. Wysocki]

On Wednesday, September 07, 2011, Arnd Bergmann wrote:
> On Tuesday 06 September 2011, H Hartley Sweeten wrote:
> > rder to cleanup
> > the #if defined ugliness for the vt suspend support functions. Note that
> > CONFIG_VT_CONSOLE is already dependant on CONFIG_VT.
> > 
> > The function pm_set_vt_switch is actually dependant on CONFIG_VT and not
> > CONFIG_PM_SLEEP. This fixes a compile error when CONFIG_PM_SLEEP is
> > not set:
> > 
> > drivers/tty/vt/vt_ioctl.c:1794: error: redefinition of 'pm_set_vt_switch'
> > include/linux/suspend.h:17: error: previous definition of 'pm_set_vt_switch' was here
> > 
> > Also, remove the incorrect path from the comment in console.c.
> > 
> > Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> > Cc: Arnd Bergmann <arnd@xxxxxxx>
> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> > Cc: Pavel Machek <pavel@xxxxxx>
> > Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
> > Cc: Len Brown <len.brown@xxxxxxxxx>
> > Cc: Arthur Taylor <art@xxxxxxxx>
> > Cc: Jiri Slaby <jslaby@xxxxxxx>
> 
> Acked-by: Arnd Bergmann <arnd@xxxxxxxx>

Applied to linux-pm/linux-next, will be pushed for 3.2.

Thanks (and sorry for the delay),
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/