Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / arch / arm / mach-at91 / setup.c

diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index f7ca97b7291e2f9b48a2968f47bc92e788ff79cf..f7a07a58ebb6aa10da5f9aae0dac80bd745d1e15 100644 (file)
--- 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 },