diff options
Diffstat (limited to 'drivers/char/tpm/tpm_tis.c')
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 4d0df3324e4f..ee7ac6f43c65 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c | |||
@@ -432,7 +432,8 @@ static int interrupts = 1; | |||
432 | module_param(interrupts, bool, 0444); | 432 | module_param(interrupts, bool, 0444); |
433 | MODULE_PARM_DESC(interrupts, "Enable interrupts"); | 433 | MODULE_PARM_DESC(interrupts, "Enable interrupts"); |
434 | 434 | ||
435 | static int tpm_tis_init(struct device *dev, unsigned long start, unsigned long len) | 435 | static int tpm_tis_init(struct device *dev, resource_size_t start, |
436 | resource_size_t len) | ||
436 | { | 437 | { |
437 | u32 vendor, intfcaps, intmask; | 438 | u32 vendor, intfcaps, intmask; |
438 | int rc, i; | 439 | int rc, i; |
@@ -593,7 +594,7 @@ out_err: | |||
593 | static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, | 594 | static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, |
594 | const struct pnp_device_id *pnp_id) | 595 | const struct pnp_device_id *pnp_id) |
595 | { | 596 | { |
596 | unsigned long start, len; | 597 | resource_size_t start, len; |
597 | start = pnp_mem_start(pnp_dev, 0); | 598 | start = pnp_mem_start(pnp_dev, 0); |
598 | len = pnp_mem_len(pnp_dev, 0); | 599 | len = pnp_mem_len(pnp_dev, 0); |
599 | 600 | ||