- tpm-add-hid-module-paramater.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     tpm: add HID module parameter

has been removed from the -mm tree.  Its filename is

     tpm-add-hid-module-paramater.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.


From: Kylene Jo Hall <kjhall@xxxxxxxxxx>

I recently found that not all BIOS manufacturers are using the specified
generic PNP id in their TPM ACPI table entry.  I have added the vendor
specific IDs that I know about and added a module parameter that a user can
specify another HID to the probe list if their device isn't being found by the
default list.

Signed-off-by: Kylene Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/char/tpm/tpm_tis.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

diff -puN drivers/char/tpm/tpm_tis.c~tpm-add-hid-module-paramater drivers/char/tpm/tpm_tis.c
--- devel/drivers/char/tpm/tpm_tis.c~tpm-add-hid-module-paramater	2006-04-22 02:35:02.000000000 -0700
+++ devel-akpm/drivers/char/tpm/tpm_tis.c	2006-04-22 02:35:02.000000000 -0700
@@ -610,7 +610,13 @@ static int tpm_tis_pnp_resume(struct pnp
 
 static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
 	{"PNP0C31", 0},		/* TPM */
-	{"", 0}
+	{"ATM1200", 0},		/* Atmel */
+	{"IFX0102", 0},		/* Infineon */
+	{"BCM0101", 0},		/* Broadcom */
+	{"NSC1200", 0},		/* National */
+	/* Add new here */
+	{"", 0},		/* User Specified */
+	{"", 0}			/* Terminator */
 };
 
 static struct pnp_driver tis_pnp_driver = {
@@ -621,6 +627,11 @@ static struct pnp_driver tis_pnp_driver 
 	.resume = tpm_tis_pnp_resume,
 };
 
+#define TIS_HID_USR_IDX sizeof(tpm_pnp_tbl)/sizeof(struct pnp_device_id) -2
+module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,
+		    sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);
+MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");
+
 static int __init init_tis(void)
 {
 	return pnp_register_driver(&tis_pnp_driver);
_

Patches currently in -mm which might be from kjhall@xxxxxxxxxx are

origin.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux