aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-orion/gpio.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-05-15 12:42:15 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-05-15 12:42:15 -0700
commit15a6affec4449b54afba15ab7edbad0cac2736d3 (patch)
treef2fa815f74be0b56acd05e62113600a7113d48a9 /arch/arm/plat-orion/gpio.c
parentcd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff)
parentf722406faae2d073cc1d01063d1123c35425939e (diff)
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/arm/plat-orion/gpio.c')
-rw-r--r--arch/arm/plat-orion/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e39c2ba6e2fb..249fe6333e18 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -150,7 +150,7 @@ err_out:
}
/*
- * GENERIC_GPIO primitives.
+ * GPIO primitives.
*/
static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
{