summaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/mach-jz4740/gpio.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-04-22 01:32:51 +0300
committerDave Airlie <airlied@redhat.com>2016-04-22 01:32:51 +0300
commit49047962ecf02d76bdaa378c00a51c9b829ac195 (patch)
tree4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /arch/mips/include/asm/mach-jz4740/gpio.h
parentd57d47735ef5461952ef1dbdd515ebc0ffc5d2cc (diff)
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff)
downloadlinux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.xz
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915. Linux 4.6-rc3
Diffstat (limited to 'arch/mips/include/asm/mach-jz4740/gpio.h')
-rw-r--r--arch/mips/include/asm/mach-jz4740/gpio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-jz4740/gpio.h b/arch/mips/include/asm/mach-jz4740/gpio.h
index bf8c3e1860e7..7c7708a23baa 100644
--- a/arch/mips/include/asm/mach-jz4740/gpio.h
+++ b/arch/mips/include/asm/mach-jz4740/gpio.h
@@ -27,7 +27,7 @@ enum jz_gpio_function {
/*
Usually a driver for a SoC component has to request several gpio pins and
- configure them as funcion pins.
+ configure them as function pins.
jz_gpio_bulk_request can be used to ease this process.
Usually one would do something like: