Merge branch 'dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...

* 'dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board
  ARM: OMAP2+: Remove extra ifdefs for board-generic
  ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
  ARM: OMAP2+: board-generic: Use of_irq_init API
  arm/dts: OMAP3: Add interrupt-controller bindings for INTC
  ARM: OMAP2/3: intc: Add DT support for TI interrupt controller

diff --combined arch/arm/mach-omap2/common.h
index 7e9338e8d684c7ff442a517be55de218ba34e8c7,dd8c9906b1ab37d68eb02bc1491848edc15bcb2e..99604d364305c084ad1057f3286472587cdba5fe
--- 1/arch/arm/mach-omap2/common.h
--- 2/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@@ -132,7 -132,6 +132,7 @@@ void omap3_map_io(void)
  void am33xx_map_io(void);
  void omap4_map_io(void);
  void ti81xx_map_io(void);
 +void omap_barriers_init(void);
  
  /**
   * omap_test_timeout - busy-loop, testing a condition
@@@ -175,6 -174,18 +175,18 @@@ void omap3_intc_handle_irq(struct pt_re
  extern void __iomem *omap4_get_l2cache_base(void);
  #endif
  
+ struct device_node;
+ #ifdef CONFIG_OF
+ int __init omap_intc_of_init(struct device_node *node,
+                            struct device_node *parent);
+ #else
+ int __init omap_intc_of_init(struct device_node *node,
+                            struct device_node *parent)
+ {
+       return 0;
+ }
+ #endif
+ 
  #ifdef CONFIG_SMP
  extern void __iomem *omap4_get_scu_base(void);
  #else