Message ID | 1389139662-6590-1-git-send-email-cheiny@synaptics.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jan 07, 2014 at 04:07:42PM -0800, Christopher Heiny wrote: > This has two trivial changes: > > 1) use CONFIG_PM_SLEEP instead of CONFIG_PM for consistency. > > 2) Update the copyright date. > > Signed-off-by: Christopher Heiny <cheiny@synaptics.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Applied, thank you. > > --- > drivers/input/rmi4/rmi_f01.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c > index 628b082..d547633 100644 > --- a/drivers/input/rmi4/rmi_f01.c > +++ b/drivers/input/rmi4/rmi_f01.c > @@ -1,5 +1,5 @@ > /* > - * Copyright (c) 2011-2012 Synaptics Incorporated > + * Copyright (c) 2011-2014 Synaptics Incorporated > * Copyright (c) 2011 Unixphere > * > * This program is free software; you can redistribute it and/or modify it > @@ -138,7 +138,7 @@ struct f01_data { > int irq_count; > int num_of_irq_regs; > > -#ifdef CONFIG_PM > +#ifdef CONFIG_PM_SLEEP > bool suspended; > bool old_nosleep; > #endif
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c index 628b082..d547633 100644 --- a/drivers/input/rmi4/rmi_f01.c +++ b/drivers/input/rmi4/rmi_f01.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 Synaptics Incorporated + * Copyright (c) 2011-2014 Synaptics Incorporated * Copyright (c) 2011 Unixphere * * This program is free software; you can redistribute it and/or modify it @@ -138,7 +138,7 @@ struct f01_data { int irq_count; int num_of_irq_regs; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP bool suspended; bool old_nosleep; #endif
This has two trivial changes: 1) use CONFIG_PM_SLEEP instead of CONFIG_PM for consistency. 2) Update the copyright date. Signed-off-by: Christopher Heiny <cheiny@synaptics.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- drivers/input/rmi4/rmi_f01.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html