diff options
author | Michael Turquette <mturquette@baylibre.com> | 2015-06-19 16:37:14 +0200 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2015-06-19 16:37:14 +0200 |
commit | 909aa10e6d6a9524f95dadb6b3ded1c38ec34e11 (patch) | |
tree | 5fb10cd60e0b3c0b2372e1aed143305b32fe3888 /drivers/clk/at91/pmc.h | |
parent | Linux 4.1-rc8 (diff) | |
parent | clk: at91: fix h32mx prototype inclusion in pmc header (diff) | |
download | linux-909aa10e6d6a9524f95dadb6b3ded1c38ec34e11.tar.xz linux-909aa10e6d6a9524f95dadb6b3ded1c38ec34e11.zip |
Merge branch 'ccf/atmel-fixes-for-4.1' of https://github.com/bbrezillon/linux-at91 into clk-fixes
Diffstat (limited to 'drivers/clk/at91/pmc.h')
-rw-r--r-- | drivers/clk/at91/pmc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h index 69abb08cf146..eb8e5dc9076d 100644 --- a/drivers/clk/at91/pmc.h +++ b/drivers/clk/at91/pmc.h @@ -121,7 +121,7 @@ extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np, 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 |