aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2013-05-27 15:39:57 -0400
committerPeter Huewe <peterhuewe@gmx.de>2013-05-27 16:09:09 -0400
commite2fa3d799b7471f00adae59ff36260ad8237929f (patch)
tree0ae8f07c4efd4720e8ee6afad93d98927fc1ac4e
parent5b88e270253db6d817e6a2f61909d1e53620e990 (diff)
tpm: fix regression caused by section type conflict of tpm_dev_release() in ppc builds
The 8119807 commit reintroduced a regression (error: __ksymtab_tpm_dev_release causes a section type conflict) that was fixed by commit cbb2ed4. Fix it for good by adding the prototype to tpm.h so sparse doesn't complain about it anymore. Reported-by: Tony Camuso <tcamuso@redhat.com> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
-rw-r--r--drivers/char/tpm/tpm.c2
-rw-r--r--drivers/char/tpm/tpm.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 7c3b3dcbfbc8..e3c974a6c522 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1472,7 +1472,7 @@ EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
1472 * Once all references to platform device are down to 0, 1472 * Once all references to platform device are down to 0,
1473 * release all allocated structures. 1473 * release all allocated structures.
1474 */ 1474 */
1475static void tpm_dev_release(struct device *dev) 1475void tpm_dev_release(struct device *dev)
1476{ 1476{
1477 struct tpm_chip *chip = dev_get_drvdata(dev); 1477 struct tpm_chip *chip = dev_get_drvdata(dev);
1478 1478
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 433423288709..a7bfc176ed43 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -332,6 +332,7 @@ extern struct tpm_chip* tpm_register_hardware(struct device *,
332 const struct tpm_vendor_specific *); 332 const struct tpm_vendor_specific *);
333extern int tpm_open(struct inode *, struct file *); 333extern int tpm_open(struct inode *, struct file *);
334extern int tpm_release(struct inode *, struct file *); 334extern int tpm_release(struct inode *, struct file *);
335extern void tpm_dev_release(struct device *dev);
335extern void tpm_dev_vendor_release(struct tpm_chip *); 336extern void tpm_dev_vendor_release(struct tpm_chip *);
336extern ssize_t tpm_write(struct file *, const char __user *, size_t, 337extern ssize_t tpm_write(struct file *, const char __user *, size_t,
337 loff_t *); 338 loff_t *);