From: Olof Johansson <olof@lixom.net>
Date: Tue, 5 Jul 2016 05:20:25 +0000 (-0700)
Subject: Merge tag 'gpmc-omap-for-v4.8' of https://github.com/rogerq/linux into next/drivers
X-Git-Tag: v4.8-rc1~67^2~21
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=9419491eda7daf74b189b80f80390034ddb04496

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>
---

9419491eda7daf74b189b80f80390034ddb04496