tpm: fix header for modular build
authorRandy Dunlap <randy.dunlap@oracle.com>
Wed, 28 Oct 2009 19:26:39 +0000 (12:26 -0700)
committerJames Morris <jmorris@namei.org>
Thu, 29 Oct 2009 00:17:40 +0000 (11:17 +1100)
commitff76ec18cabb12a6c8f3c65bd1d23f1a770fe908
treedd9e8c788ba25f40483620bec6e34cff371ba886
parent024e1a49411a1a7363e65db48edf1b09e9ee68ad
tpm: fix header for modular build

Fix build for TCG_TPM=m.  Header file doesn't handle this
and incorrectly builds stubs.

drivers/char/tpm/tpm.c:720: error: redefinition of 'tpm_pcr_read'
include/linux/tpm.h:35: error:previous definition of 'tpm_pcr_read' was here
drivers/char/tpm/tpm.c:752: error: redefinition of 'tpm_pcr_extend'
include/linux/tpm.h:38: error:previous definition of 'tpm_pcr_extend' was here

Repairs linux-next's

commit d6ba452128178091dab7a04d54f7e66fdc32fb39
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date:   Mon Oct 26 09:26:18 2009 -0400

    tpm add default function definitions

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: Mimi Zohar <zohar@us.ibm.com>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
include/linux/tpm.h