git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
i2c
/
chips
/
isp1301_omap.c
diff --git
a/drivers/i2c/chips/isp1301_omap.c
b/drivers/i2c/chips/isp1301_omap.c
index
1251c7f
..
182f049
100644
(file)
--- a/
drivers/i2c/chips/isp1301_omap.c
+++ b/
drivers/i2c/chips/isp1301_omap.c
@@
-21,7
+21,6
@@
#undef DEBUG
#undef VERBOSE
#undef DEBUG
#undef VERBOSE
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-31,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>
@@
-909,7
+908,7
@@
static int otg_bind(struct isp1301 *isp)
if (otg_dev)
status = request_irq(otg_dev->resource[1].start, omap_otg_irq,
if (otg_dev)
status = request_irq(otg_dev->resource[1].start, omap_otg_irq,
-
SA_INTERRUPT
, DRIVER_NAME, isp);
+
IRQF_DISABLED
, DRIVER_NAME, isp);
else
status = -ENODEV;
else
status = -ENODEV;
@@
-1579,7
+1578,7
@@
fail1:
}
status = request_irq(isp->irq, isp1301_irq,
}
status = request_irq(isp->irq, isp1301_irq,
-
SA
_SAMPLE_RANDOM, DRIVER_NAME, isp);
+
IRQF
_SAMPLE_RANDOM, DRIVER_NAME, isp);
if (status < 0) {
dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
isp->irq, status);
if (status < 0) {
dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
isp->irq, status);
@@
-1635,8
+1634,6
@@
static struct i2c_driver isp1301_driver = {
.driver = {
.name = "isp1301_omap",
},
.driver = {
.name = "isp1301_omap",
},
- .id = 1301, /* FIXME "official", i2c-ids.h */
- .class = I2C_CLASS_HWMON,
.attach_adapter = isp1301_scan_bus,
.detach_client = isp1301_detach_client,
};
.attach_adapter = isp1301_scan_bus,
.detach_client = isp1301_detach_client,
};