lkml.org 
[lkml]   [2011]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] vt/suspend: cleanup #if defined uglyness and fix compile error
Date
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@visionengravers.com>
> > Cc: Arnd Bergmann <arnd@arnd.de>
> > Cc: Andrew Morton <akpm@linux-foundation.org>
> > Cc: Greg Kroah-Hartman <gregkh@suse.de>
> > Cc: Pavel Machek <pavel@ucw.cz>
> > Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> > Cc: Len Brown <len.brown@intel.com>
> > Cc: Arthur Taylor <art@ified.ca>
> > Cc: Jiri Slaby <jslaby@suse.cz>
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>

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

Thanks (and sorry for the delay),
Rafael


\
 
 \ /
  Last update: 2011-09-21 22:59    [W:0.036 / U:1.776 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site