projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
[cascardo/linux.git]
/
drivers
/
media
/
rc
/
ir-hix5hd2.c
diff --git
a/drivers/media/rc/ir-hix5hd2.c
b/drivers/media/rc/ir-hix5hd2.c
index
08bbd4f
..
b0df629
100644
(file)
--- a/
drivers/media/rc/ir-hix5hd2.c
+++ b/
drivers/media/rc/ir-hix5hd2.c
@@
-297,7
+297,7
@@
static int hix5hd2_ir_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int hix5hd2_ir_suspend(struct device *dev)
{
struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);