aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:19:57 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 11:08:24 -0800
commit164dce822157311eeb81470492889bcd83d84ff1 (patch)
treed4b390ef61e91031705a76575dab922cbe05b57a /drivers/char/tpm
parentafc6d36912f3f3404fcc1dd2234d9028706a9b6a (diff)
downloadkernel_goldelico_gta04-164dce822157311eeb81470492889bcd83d84ff1.zip
kernel_goldelico_gta04-164dce822157311eeb81470492889bcd83d84ff1.tar.gz
kernel_goldelico_gta04-164dce822157311eeb81470492889bcd83d84ff1.tar.bz2
tpm_infineon: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Rajiv Andrade <mail@srajiv.net> Cc: Marcel Selhorst <tpmdd@selhorst.net> Cc: Sirrix AG <tpmdd@sirrix.com> Acked-by: Kent Yoder <key@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/tpm_infineon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 8d9ff73..0126e80 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -655,7 +655,7 @@ static struct pnp_driver tpm_inf_pnp_driver = {
.probe = tpm_inf_pnp_probe,
.suspend = tpm_inf_pnp_suspend,
.resume = tpm_inf_pnp_resume,
- .remove = __devexit_p(tpm_inf_pnp_remove)
+ .remove = tpm_inf_pnp_remove
};
static int __init init_inf(void)