diff options
| -rw-r--r-- | arch/arm/mach-pxa/viper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 9e0c5c3988a1..e90114a7e246 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/pm.h> | 34 | #include <linux/pm.h> |
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/gpio.h> | 36 | #include <linux/gpio.h> |
| 37 | #include <linux/jiffies.h> | ||
| 37 | #include <linux/i2c-gpio.h> | 38 | #include <linux/i2c-gpio.h> |
| 38 | #include <linux/serial_8250.h> | 39 | #include <linux/serial_8250.h> |
| 39 | #include <linux/smc91x.h> | 40 | #include <linux/smc91x.h> |
| @@ -454,7 +455,7 @@ static struct i2c_gpio_platform_data i2c_bus_data = { | |||
| 454 | .sda_pin = VIPER_RTC_I2C_SDA_GPIO, | 455 | .sda_pin = VIPER_RTC_I2C_SDA_GPIO, |
| 455 | .scl_pin = VIPER_RTC_I2C_SCL_GPIO, | 456 | .scl_pin = VIPER_RTC_I2C_SCL_GPIO, |
| 456 | .udelay = 10, | 457 | .udelay = 10, |
| 457 | .timeout = 100, | 458 | .timeout = HZ, |
| 458 | }; | 459 | }; |
| 459 | 460 | ||
| 460 | static struct platform_device i2c_bus_device = { | 461 | static struct platform_device i2c_bus_device = { |
| @@ -779,7 +780,7 @@ static void __init viper_tpm_init(void) | |||
| 779 | .sda_pin = VIPER_TPM_I2C_SDA_GPIO, | 780 | .sda_pin = VIPER_TPM_I2C_SDA_GPIO, |
| 780 | .scl_pin = VIPER_TPM_I2C_SCL_GPIO, | 781 | .scl_pin = VIPER_TPM_I2C_SCL_GPIO, |
| 781 | .udelay = 10, | 782 | .udelay = 10, |
| 782 | .timeout = 100, | 783 | .timeout = HZ, |
| 783 | }; | 784 | }; |
| 784 | char *errstr; | 785 | char *errstr; |
| 785 | 786 | ||
