diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-10 23:00:44 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-10 23:00:44 +0100 |
commit | bef6e7e76868ab454d5e83635a4a7a1961c74fb5 (patch) | |
tree | 1a7417b9dde942cc71f87c02688c6ac6b0e57a72 /arch/arm/mach-s3c64xx/gpiolib.c | |
parent | net: bridge builtin vs. ipv6 modular (diff) | |
parent | Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
download | linux-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.tar.xz linux-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-s3c64xx/gpiolib.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/gpiolib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/gpiolib.c b/arch/arm/mach-s3c64xx/gpiolib.c index fd99a82e82c4..92b09085caaa 100644 --- a/arch/arm/mach-s3c64xx/gpiolib.c +++ b/arch/arm/mach-s3c64xx/gpiolib.c @@ -72,7 +72,7 @@ static struct s3c_gpio_cfg gpio_4bit_cfg_eint0011 = { .get_pull = s3c_gpio_getpull_updown, }; -int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin) +static int s3c64xx_gpio2int_gpm(struct gpio_chip *chip, unsigned pin) { return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO; } @@ -138,7 +138,7 @@ static struct s3c_gpio_chip gpio_4bit[] = { }, }; -int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin) +static int s3c64xx_gpio2int_gpl(struct gpio_chip *chip, unsigned pin) { return pin >= 8 ? IRQ_EINT(16) + pin - 8 : -ENXIO; } |