git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i2c: i2c-pnx: Added missing mach/i2c.h and linux/io.h header file includes
[sfrench/cifs-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-pnx.c
diff --git
a/drivers/i2c/busses/i2c-pnx.c
b/drivers/i2c/busses/i2c-pnx.c
index 6ff6c20f1e78d261d6543b4e633c53aa0f80325c..1fca59077949352645ee9941b8fa121703062ca3 100644
(file)
--- a/
drivers/i2c/busses/i2c-pnx.c
+++ b/
drivers/i2c/busses/i2c-pnx.c
@@
-19,7
+19,9
@@
#include <linux/completion.h>
#include <linux/platform_device.h>
#include <linux/i2c-pnx.h>
#include <linux/completion.h>
#include <linux/platform_device.h>
#include <linux/i2c-pnx.h>
+#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
+#include <mach/i2c.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
@@
-54,6
+56,9
@@
static inline void i2c_pnx_arm_timer(struct i2c_adapter *adap)
struct timer_list *timer = &data->mif.timer;
int expires = I2C_PNX_TIMEOUT / (1000 / HZ);
struct timer_list *timer = &data->mif.timer;
int expires = I2C_PNX_TIMEOUT / (1000 / HZ);
+ if (expires <= 1)
+ expires = 2;
+
del_timer_sync(timer);
dev_dbg(&adap->dev, "Timer armed at %lu plus %u jiffies.\n",
del_timer_sync(timer);
dev_dbg(&adap->dev, "Timer armed at %lu plus %u jiffies.\n",