diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/arm/plat-s3c24xx/gpiolib.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'arch/arm/plat-s3c24xx/gpiolib.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 849f8469714a..3caec6bad3eb 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c | |||
| @@ -39,7 +39,7 @@ static inline struct s3c24xx_gpio_chip *to_s3c_chip(struct gpio_chip *gpc) | |||
| 39 | * drivers themsevles. | 39 | * drivers themsevles. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | 42 | static int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) |
| 43 | { | 43 | { |
| 44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| 45 | void __iomem *base = ourchip->base; | 45 | void __iomem *base = ourchip->base; |
| @@ -58,7 +58,7 @@ int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | |||
| 58 | return 0; | 58 | return 0; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | int s3c24xx_gpiolib_output(struct gpio_chip *chip, | 61 | static int s3c24xx_gpiolib_output(struct gpio_chip *chip, |
| 62 | unsigned offset, int value) | 62 | unsigned offset, int value) |
| 63 | { | 63 | { |
| 64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| @@ -86,7 +86,8 @@ int s3c24xx_gpiolib_output(struct gpio_chip *chip, | |||
| 86 | return 0; | 86 | return 0; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | 89 | static void s3c24xx_gpiolib_set(struct gpio_chip *chip, |
| 90 | unsigned offset, int value) | ||
| 90 | { | 91 | { |
| 91 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 92 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| 92 | void __iomem *base = ourchip->base; | 93 | void __iomem *base = ourchip->base; |
| @@ -104,7 +105,7 @@ void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | |||
| 104 | local_irq_restore(flags); | 105 | local_irq_restore(flags); |
| 105 | } | 106 | } |
| 106 | 107 | ||
| 107 | int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) | 108 | static int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) |
| 108 | { | 109 | { |
| 109 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 110 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
| 110 | unsigned long val; | 111 | unsigned long val; |
| @@ -150,8 +151,7 @@ static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip, | |||
| 150 | return 0; | 151 | return 0; |
| 151 | } | 152 | } |
| 152 | 153 | ||
| 153 | 154 | static struct s3c24xx_gpio_chip gpios[] = { | |
| 154 | struct s3c24xx_gpio_chip gpios[] = { | ||
| 155 | [0] = { | 155 | [0] = { |
| 156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), | 156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), |
| 157 | .chip = { | 157 | .chip = { |