OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3b09825
)
char/tpm/tpm_crb: fix build error
author
Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com>
Mon, 19 Jan 2015 08:43:40 +0000
(10:43 +0200)
committer
Peter Huewe
<peterhuewe@gmx.de>
Mon, 19 Jan 2015 19:46:50 +0000
(20:46 +0100)
SIMPLE_DEV_PM_OPS() was inside #ifdef CONFIG_PM_SLEEP.
Fixes:
30fc8d1
("tpm: TPM 2.0 CRB Interface")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
drivers/char/tpm/tpm_crb.c
patch
|
blob
|
history
diff --git
a/drivers/char/tpm/tpm_crb.c
b/drivers/char/tpm/tpm_crb.c
index
c248a35
..
3dd23cf
100644
(file)
--- a/
drivers/char/tpm/tpm_crb.c
+++ b/
drivers/char/tpm/tpm_crb.c
@@
-107,9
+107,9
@@
static int crb_resume(struct device *dev)
return rc;
}
+#endif
static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, crb_resume);
-#endif
static u8 crb_status(struct tpm_chip *chip)
{