diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 16:33:47 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 16:33:47 (GMT) |
| commit | 260caadebde754a3851803a17a8287478c090a80 (patch) | |
| tree | 1c91bb7ecc1bf119217aa1b2db7172f3325d0731 /arch/arm/mach-imx | |
| parent | 55d421b40cbb2d8bec71a1b92671e48d2ee7ca98 (diff) | |
| parent | 502ad2a669f146e0801973c42e55478322f2d382 (diff) | |
| download | linux-260caadebde754a3851803a17a8287478c090a80.tar.xz | |
Merge tag 'omap-for-v4.9/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Merge "omap soc updates for v4.9 merge window" from Tony Lindgren:
Two patches from Javier Martinez Canillas <javier@osg.samsung.com>
to update mach-omap1 and mach-oamp2 to use IS_ENABLED macro.
* tag 'omap-for-v4.9/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module
ARM: OMAP1: use IS_ENABLED() instead of checking for built-in or module
Diffstat (limited to 'arch/arm/mach-imx')
0 files changed, 0 insertions, 0 deletions