diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-s3c2410.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index f7d40f8e5f5c..9ebe429a0a0f 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
| @@ -567,7 +566,7 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap) | |||
| 567 | 566 | ||
| 568 | /* i2c bus registration info */ | 567 | /* i2c bus registration info */ |
| 569 | 568 | ||
| 570 | static struct i2c_algorithm s3c24xx_i2c_algorithm = { | 569 | static const struct i2c_algorithm s3c24xx_i2c_algorithm = { |
| 571 | .master_xfer = s3c24xx_i2c_xfer, | 570 | .master_xfer = s3c24xx_i2c_xfer, |
| 572 | .functionality = s3c24xx_i2c_func, | 571 | .functionality = s3c24xx_i2c_func, |
| 573 | }; | 572 | }; |
| @@ -829,7 +828,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
| 829 | goto out; | 828 | goto out; |
| 830 | } | 829 | } |
| 831 | 830 | ||
| 832 | ret = request_irq(res->start, s3c24xx_i2c_irq, SA_INTERRUPT, | 831 | ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED, |
| 833 | pdev->name, i2c); | 832 | pdev->name, i2c); |
| 834 | 833 | ||
| 835 | if (ret != 0) { | 834 | if (ret != 0) { |