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
/
busses
/
i2c-s3c2410.c
diff --git
a/drivers/i2c/busses/i2c-s3c2410.c
b/drivers/i2c/busses/i2c-s3c2410.c
index
f7d40f8
..
4ca6de2
100644
(file)
--- a/
drivers/i2c/busses/i2c-s3c2410.c
+++ b/
drivers/i2c/busses/i2c-s3c2410.c
@@
-20,7
+20,6
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-424,8
+423,7
@@
static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
* top level IRQ servicing routine
*/
* top level IRQ servicing routine
*/
-static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id)
{
struct s3c24xx_i2c *i2c = dev_id;
unsigned long status;
{
struct s3c24xx_i2c *i2c = dev_id;
unsigned long status;
@@
-567,7
+565,7
@@
static u32 s3c24xx_i2c_func(struct i2c_adapter *adap)
/* i2c bus registration info */
/* i2c bus registration info */
-static struct i2c_algorithm s3c24xx_i2c_algorithm = {
+static
const
struct i2c_algorithm s3c24xx_i2c_algorithm = {
.master_xfer = s3c24xx_i2c_xfer,
.functionality = s3c24xx_i2c_func,
};
.master_xfer = s3c24xx_i2c_xfer,
.functionality = s3c24xx_i2c_func,
};
@@
-829,7
+827,7
@@
static int s3c24xx_i2c_probe(struct platform_device *pdev)
goto out;
}
goto out;
}
- ret = request_irq(res->start, s3c24xx_i2c_irq,
SA_INTERRUPT
,
+ ret = request_irq(res->start, s3c24xx_i2c_irq,
IRQF_DISABLED
,
pdev->name, i2c);
if (ret != 0) {
pdev->name, i2c);
if (ret != 0) {