# \[GIT PULL 1/3\] omap soc updates for v4.9 merge window

- From: Tony Lindgren \<tony@atomide.com\>
- Date: 2016-09-02 16:41:04 
- List: linux-arm-kernel
- Page: https://ratatoskr.run/linux-arm-kernel/2016/09/8740848
- Thread: https://ratatoskr.run/linux-arm-kernel/2016/09/8740848/t.md

```text
* Arnd Bergmann [ref] [160902 09:36]:
> On Thursday, September 1, 2016 8:45:19 AM CEST Tony Lindgren wrote:
> > Javier Martinez Canillas (2):
> >       ARM: OMAP1: use IS_ENABLED() instead of checking for built-in or module
> >       ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module
> > 
> 
> I've pulled this into next/cleanup as well, to avoid the trivial
> conflict against the file removal in the omap3 legacy branch.

OK

> Any other omap soc updates for v4.9 should just be based on this
> omap-for-v4.9/soc-signed branch anyway.

Yeah thanks,

Tony
```