diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/i2c/busses/i2c-ite.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/i2c/busses/i2c-ite.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ite.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c index 559a62b04ee9..f7d71869b3b9 100644 --- a/drivers/i2c/busses/i2c-ite.c +++ b/drivers/i2c/busses/i2c-ite.c | |||
| @@ -140,8 +140,7 @@ static void iic_ite_waitforpin(void) { | |||
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | 142 | ||
| 143 | static irqreturn_t iic_ite_handler(int this_irq, void *dev_id, | 143 | static irqreturn_t iic_ite_handler(int this_irq, void *dev_id) |
| 144 | struct pt_regs *regs) | ||
| 145 | { | 144 | { |
| 146 | spin_lock(&lock); | 145 | spin_lock(&lock); |
| 147 | iic_pending = 1; | 146 | iic_pending = 1; |