diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-13 17:44:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:19:28 +0100 |
| commit | dfe367632656d3abd954edf2921e1a2af2d48e44 (patch) | |
| tree | 411f1aefbc9b61ad60c7e7b9d726137d8e341a2a /arch/arm/mach-at91 | |
| parent | fe138c236bf7e146a9bbf3c465258a5d6beaf9fc (diff) | |
| download | linux-stable-dfe367632656d3abd954edf2921e1a2af2d48e44.tar.gz linux-stable-dfe367632656d3abd954edf2921e1a2af2d48e44.tar.bz2 linux-stable-dfe367632656d3abd954edf2921e1a2af2d48e44.zip | |
ARM: at91: don't provide dt init code for at91x40
at91x40 has no support for device tree, but Kconfig allows
us to enable CONFIG_OF anyway, causing a link error in the
at91 reset controller initialization.
The easiest fix is to adapt the existing #ifdef to omit
the broken code on at91x40 where it is never called anyway.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index f7ca97b7291e..f7a07a58ebb6 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -351,7 +351,7 @@ void __init at91_ioremap_matrix(u32 base_addr) panic("Impossible to ioremap at91_matrix_base\n"); } -#if defined(CONFIG_OF) +#if defined(CONFIG_OF) && !defined(CONFIG_ARCH_AT91X40) static struct of_device_id rstc_ids[] = { { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9_alt_restart }, { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, |