Merge branch 'ccf/atmel-fixes-for-4.1' of https://github.com/bbrezillon/linux-at91...

diff --combined drivers/clk/at91/pmc.h
index 69abb08,af2c991..eb8e5dc
--- 1/drivers/clk/at91/pmc.h
--- 2/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@@ -33,7 -33,6 +33,7 @@@ struct at91_pmc 
        spinlock_t lock;
        const struct at91_pmc_caps *caps;
        struct irq_domain *irqdomain;
 +      u32 imr;
  };
  
  static inline void pmc_lock(struct at91_pmc *pmc)
@@@ -121,7 -120,7 +121,7 @@@ extern void __init of_at91sam9x5_clk_sm
                                               struct at91_pmc *pmc);
  #endif
  
- #if defined(CONFIG_HAVE_AT91_SMD)
+ #if defined(CONFIG_HAVE_AT91_H32MX)
  extern void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
                                              struct at91_pmc *pmc);
  #endif