diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-28 19:30:21 +0300 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-28 19:30:21 +0300 |
commit | ac2a8bca03a6d281c78e803899001e22a92b92e9 (patch) | |
tree | 5969d5e812165a2b113601109833e8bd2e662d71 /include/linux | |
parent | a6a1cf3d963daaf80e467793060be1fa57599a4b (diff) | |
parent | 3c6e8d05d60d8106b5cdc730cf220b2a4b521b66 (diff) | |
download | linux-ac2a8bca03a6d281c78e803899001e22a92b92e9.tar.xz |
Merge branch 'ib-move-htc-egpio' into devel
Diffstat (limited to 'include/linux')
-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 |