diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /drivers/char/tpm/tpm.h | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
| download | talos-obmc-linux-f055408957750cf759162c364c2a4dfe19765844.tar.gz talos-obmc-linux-f055408957750cf759162c364c2a4dfe19765844.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/tpm/tpm.h')
| -rw-r--r-- | drivers/char/tpm/tpm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 9293bcc4dc62..159882ca69dd 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -50,7 +50,11 @@ struct tpm_vendor_specific { u8 req_complete_mask; u8 req_complete_val; u8 req_canceled; - u16 base; /* TPM base address */ + void __iomem *iobase; /* ioremapped address */ + unsigned long base; /* TPM base address */ + + int region_size; + int have_region; int (*recv) (struct tpm_chip *, u8 *, size_t); int (*send) (struct tpm_chip *, u8 *, size_t); @@ -73,6 +77,7 @@ struct tpm_chip { struct semaphore buffer_mutex; struct timer_list user_read_timer; /* user needs to claim result */ + struct work_struct work; struct semaphore tpm_mutex; /* tpm is processing */ struct tpm_vendor_specific *vendor; |
