diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/i2c | |
parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-powermac.c | 1 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/scx200_i2c.c | 1 | ||||
-rw-r--r-- | drivers/i2c/chips/isp1301_omap.c | 5 | ||||
-rw-r--r-- | drivers/i2c/chips/tps65010.c | 9 |
10 files changed, 11 insertions, 19 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 8b46ef7d9ff8..7be1d0a3e8f8 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
@@ -494,8 +494,8 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id | |||
494 | err = pci_request_region(dev, SMBBAR, i801_driver.name); | 494 | err = pci_request_region(dev, SMBBAR, i801_driver.name); |
495 | if (err) { | 495 | if (err) { |
496 | dev_err(&dev->dev, "Failed to request SMBus region " | 496 | dev_err(&dev->dev, "Failed to request SMBus region " |
497 | "0x%lx-0x%lx\n", i801_smba, | 497 | "0x%lx-0x%Lx\n", i801_smba, |
498 | pci_resource_end(dev, SMBBAR)); | 498 | (unsigned long long)pci_resource_end(dev, SMBBAR)); |
499 | goto exit; | 499 | goto exit; |
500 | } | 500 | } |
501 | 501 | ||
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 87fae937e666..0599bbd65d93 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
@@ -28,7 +28,6 @@ | |||
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/config.h> | ||
32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
34 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index d00a02fc23e4..aca7e1668605 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * the Free Software Foundation, version 2. | 26 | * the Free Software Foundation, version 2. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <linux/config.h> | ||
30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 2721e4c8184a..377ab40944b8 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
@@ -319,7 +318,7 @@ static int fsl_i2c_probe(struct platform_device *pdev) | |||
319 | 318 | ||
320 | if (i2c->irq != 0) | 319 | if (i2c->irq != 0) |
321 | if ((result = request_irq(i2c->irq, mpc_i2c_isr, | 320 | if ((result = request_irq(i2c->irq, mpc_i2c_isr, |
322 | SA_SHIRQ, "i2c-mpc", i2c)) < 0) { | 321 | IRQF_SHARED, "i2c-mpc", i2c)) < 0) { |
323 | printk(KERN_ERR | 322 | printk(KERN_ERR |
324 | "i2c-mpc - failed to attach interrupt\n"); | 323 | "i2c-mpc - failed to attach interrupt\n"); |
325 | goto fail_irq; | 324 | goto fail_irq; |
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index df786eb55295..2a0b3be7cdd0 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c | |||
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 5155010b455e..ee114b48face 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct platform_device *dev) | |||
968 | #endif | 968 | #endif |
969 | 969 | ||
970 | pxa_set_cken(CKEN14_I2C, 1); | 970 | pxa_set_cken(CKEN14_I2C, 1); |
971 | ret = request_irq(IRQ_I2C, i2c_pxa_handler, SA_INTERRUPT, | 971 | ret = request_irq(IRQ_I2C, i2c_pxa_handler, IRQF_DISABLED, |
972 | "pxa2xx-i2c", i2c); | 972 | "pxa2xx-i2c", i2c); |
973 | if (ret) | 973 | if (ret) |
974 | goto out; | 974 | goto out; |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index f7d40f8e5f5c..5d2950e91fc5 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 | ||
@@ -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) { |
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c index 27fbfecc414f..cb3ef5ac99fd 100644 --- a/drivers/i2c/busses/scx200_i2c.c +++ b/drivers/i2c/busses/scx200_i2c.c | |||
@@ -21,7 +21,6 @@ | |||
21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index e6f1ab7b913c..f92505b94c61 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #undef DEBUG | 21 | #undef DEBUG |
22 | #undef VERBOSE | 22 | #undef VERBOSE |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
@@ -909,7 +908,7 @@ static int otg_bind(struct isp1301 *isp) | |||
909 | 908 | ||
910 | if (otg_dev) | 909 | if (otg_dev) |
911 | status = request_irq(otg_dev->resource[1].start, omap_otg_irq, | 910 | status = request_irq(otg_dev->resource[1].start, omap_otg_irq, |
912 | SA_INTERRUPT, DRIVER_NAME, isp); | 911 | IRQF_DISABLED, DRIVER_NAME, isp); |
913 | else | 912 | else |
914 | status = -ENODEV; | 913 | status = -ENODEV; |
915 | 914 | ||
@@ -1579,7 +1578,7 @@ fail1: | |||
1579 | } | 1578 | } |
1580 | 1579 | ||
1581 | status = request_irq(isp->irq, isp1301_irq, | 1580 | status = request_irq(isp->irq, isp1301_irq, |
1582 | SA_SAMPLE_RANDOM, DRIVER_NAME, isp); | 1581 | IRQF_SAMPLE_RANDOM, DRIVER_NAME, isp); |
1583 | if (status < 0) { | 1582 | if (status < 0) { |
1584 | dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n", | 1583 | dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n", |
1585 | isp->irq, status); | 1584 | isp->irq, status); |
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c index 179b1e022d80..e7e27049fbfa 100644 --- a/drivers/i2c/chips/tps65010.c +++ b/drivers/i2c/chips/tps65010.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/config.h> | ||
23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
@@ -522,14 +521,14 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind) | |||
522 | } | 521 | } |
523 | 522 | ||
524 | #ifdef CONFIG_ARM | 523 | #ifdef CONFIG_ARM |
525 | irqflags = SA_SAMPLE_RANDOM | SA_TRIGGER_LOW; | 524 | irqflags = IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_LOW; |
526 | if (machine_is_omap_h2()) { | 525 | if (machine_is_omap_h2()) { |
527 | tps->model = TPS65010; | 526 | tps->model = TPS65010; |
528 | omap_cfg_reg(W4_GPIO58); | 527 | omap_cfg_reg(W4_GPIO58); |
529 | tps->irq = OMAP_GPIO_IRQ(58); | 528 | tps->irq = OMAP_GPIO_IRQ(58); |
530 | omap_request_gpio(58); | 529 | omap_request_gpio(58); |
531 | omap_set_gpio_direction(58, 1); | 530 | omap_set_gpio_direction(58, 1); |
532 | irqflags |= SA_TRIGGER_FALLING; | 531 | irqflags |= IRQF_TRIGGER_FALLING; |
533 | } | 532 | } |
534 | if (machine_is_omap_osk()) { | 533 | if (machine_is_omap_osk()) { |
535 | tps->model = TPS65010; | 534 | tps->model = TPS65010; |
@@ -537,7 +536,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind) | |||
537 | tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1)); | 536 | tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1)); |
538 | omap_request_gpio(OMAP_MPUIO(1)); | 537 | omap_request_gpio(OMAP_MPUIO(1)); |
539 | omap_set_gpio_direction(OMAP_MPUIO(1), 1); | 538 | omap_set_gpio_direction(OMAP_MPUIO(1), 1); |
540 | irqflags |= SA_TRIGGER_FALLING; | 539 | irqflags |= IRQF_TRIGGER_FALLING; |
541 | } | 540 | } |
542 | if (machine_is_omap_h3()) { | 541 | if (machine_is_omap_h3()) { |
543 | tps->model = TPS65013; | 542 | tps->model = TPS65013; |
@@ -545,7 +544,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind) | |||
545 | // FIXME set up this board's IRQ ... | 544 | // FIXME set up this board's IRQ ... |
546 | } | 545 | } |
547 | #else | 546 | #else |
548 | irqflags = SA_SAMPLE_RANDOM; | 547 | irqflags = IRQF_SAMPLE_RANDOM; |
549 | #endif | 548 | #endif |
550 | 549 | ||
551 | if (tps->irq > 0) { | 550 | if (tps->irq > 0) { |