summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-09-28 09:30:21 -0700
committerLinus Walleij <linus.walleij@linaro.org>2016-09-28 09:30:21 -0700
commitac2a8bca03a6d281c78e803899001e22a92b92e9 (patch)
tree5969d5e812165a2b113601109833e8bd2e662d71 /include
parenta6a1cf3d963daaf80e467793060be1fa57599a4b (diff)
parent3c6e8d05d60d8106b5cdc730cf220b2a4b521b66 (diff)
downloadlwn-ac2a8bca03a6d281c78e803899001e22a92b92e9.tar.gz
lwn-ac2a8bca03a6d281c78e803899001e22a92b92e9.zip
Merge branch 'ib-move-htc-egpio' into devel
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/gpio-htc-egpio.h (renamed from include/linux/mfd/htc-egpio.h)0
1 files changed, 0 insertions, 0 deletions
diff --git a/include/linux/mfd/htc-egpio.h b/include/linux/platform_data/gpio-htc-egpio.h
index b4201c971367..b4201c971367 100644
--- a/include/linux/mfd/htc-egpio.h
+++ b/include/linux/platform_data/gpio-htc-egpio.h