git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
i2c
/
chips
/
isp1301_omap.c
diff --git
a/drivers/i2c/chips/isp1301_omap.c
b/drivers/i2c/chips/isp1301_omap.c
index
f92505b
..
ccdf3e9
100644
(file)
--- a/
drivers/i2c/chips/isp1301_omap.c
+++ b/
drivers/i2c/chips/isp1301_omap.c
@@
-30,7
+30,7
@@
#include <linux/usb_ch9.h>
#include <linux/usb_gadget.h>
#include <linux/usb.h>
#include <linux/usb_ch9.h>
#include <linux/usb_gadget.h>
#include <linux/usb.h>
-#include <linux/usb
_
otg.h>
+#include <linux/usb
/
otg.h>
#include <linux/i2c.h>
#include <linux/workqueue.h>
#include <linux/i2c.h>
#include <linux/workqueue.h>
@@
-669,7
+669,7
@@
pulldown:
dump_regs(isp, "otg->isp1301");
}
dump_regs(isp, "otg->isp1301");
}
-static irqreturn_t omap_otg_irq(int irq, void *_isp
, struct pt_regs *regs
)
+static irqreturn_t omap_otg_irq(int irq, void *_isp)
{
u16 otg_irq = OTG_IRQ_SRC_REG;
u32 otg_ctrl;
{
u16 otg_irq = OTG_IRQ_SRC_REG;
u32 otg_ctrl;
@@
-1181,7
+1181,7
@@
isp1301_work(void *data)
isp->working = 0;
}
isp->working = 0;
}
-static irqreturn_t isp1301_irq(int irq, void *isp
, struct pt_regs *regs
)
+static irqreturn_t isp1301_irq(int irq, void *isp)
{
isp1301_defer_work(isp, WORK_UPDATE_OTG);
return IRQ_HANDLED;
{
isp1301_defer_work(isp, WORK_UPDATE_OTG);
return IRQ_HANDLED;