projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a136dee 32dd625)
Merge tag 'gpmc-omap-for-v4.8' of https://github.com/rogerq/linux into next/drivers
authorOlof Johansson <olof@lixom.net>
Tue, 5 Jul 2016 05:20:25 +0000 (22:20 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Jul 2016 05:20:25 +0000 (22:20 -0700)
commit9419491eda7daf74b189b80f80390034ddb04496
tree1232be0faca751b6df26d1e0efb455923ba32acbtree | snapshot
parenta136deed0139df4b6fc92fd94468cba97b2105b9commit | diff
parent32dd625a9f3541ee6d390f12f810f28531d016c7commit | diff
Merge tag 'gpmc-omap-for-v4.8' of https://github.com/rogerq/linux into next/drivers

OMAP-GPMC: driver updates for v4.8

* Make GPMC driver non modular as it is going to
be built-in only till arch/arm/mach-omap2 users
are removed.

* Fix build if CONFIG_OF is not defined.

* tag 'gpmc-omap-for-v4.8' of https://github.com/rogerq/linux:
  memory: omap-gpmc: Move gpio functions out of #ifdef CONFIG_OF
  memory: omap-gpmc: make it explicitly non-modular

Signed-off-by: Olof Johansson <olof@lixom.net>
https://github.com/torvalds/linux.git