Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83484
b: refs/heads/master
c: e1d42c9
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Feb 6, 2008
1 parent b8d9650 commit ff63820
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec03d7073971e20a866448d62c992a168201ac82
refs/heads/master: e1d42c983ff7ba4b55d8635899186ae2ef2578ad
6 changes: 3 additions & 3 deletions trunk/drivers/char/tpm/tpm_infineon.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev)
}
}

static struct pnp_driver tpm_inf_pnp = {
static struct pnp_driver tpm_inf_pnp_driver = {
.name = "tpm_inf_pnp",
.driver = {
.owner = THIS_MODULE,
Expand All @@ -625,12 +625,12 @@ static struct pnp_driver tpm_inf_pnp = {

static int __init init_inf(void)
{
return pnp_register_driver(&tpm_inf_pnp);
return pnp_register_driver(&tpm_inf_pnp_driver);
}

static void __exit cleanup_inf(void)
{
pnp_unregister_driver(&tpm_inf_pnp);
pnp_unregister_driver(&tpm_inf_pnp_driver);
}

module_init(init_inf);
Expand Down

0 comments on commit ff63820

Please sign in to comment.