diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/arm/mach-s3c2410/gpio.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/arm/mach-s3c2410/gpio.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c index 36a3132f39e7..7974afca297c 100644 --- a/arch/arm/mach-s3c2410/gpio.c +++ b/arch/arm/mach-s3c2410/gpio.c | |||
| @@ -39,12 +39,12 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
| 39 | unsigned long flags; | 39 | unsigned long flags; |
| 40 | unsigned long val; | 40 | unsigned long val; |
| 41 | 41 | ||
| 42 | if (pin < S3C2410_GPG8 || pin > S3C2410_GPG15) | 42 | if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15)) |
| 43 | return -1; | 43 | return -EINVAL; |
| 44 | 44 | ||
| 45 | config &= 0xff; | 45 | config &= 0xff; |
| 46 | 46 | ||
| 47 | pin -= S3C2410_GPG8; | 47 | pin -= S3C2410_GPG(8); |
| 48 | reg += pin & ~3; | 48 | reg += pin & ~3; |
| 49 | 49 | ||
| 50 | local_irq_save(flags); | 50 | local_irq_save(flags); |