aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/generic.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-21 04:48:33 -0500
committerLinus Walleij <linus.walleij@linaro.org>2012-11-21 04:48:33 -0500
commit17d6b293e72547f75f5d9b680b75459cb8f2c9cf (patch)
tree54e794b046e0c7c1f819d49e9ff4499f9b6f19e5 /arch/arm/mach-at91/generic.h
parente59d969f441fb8e25b30125bdf201153adc5a7e3 (diff)
parentad8a15d99cf2c8ab8ac1ab28402c49ec2548358d (diff)
Merge branch 'delivery/pinctrl-at91-3.8' of http://github.com/at91linux/linux-at91 into at91
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
-rw-r--r--arch/arm/mach-at91/generic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index b62f560e6c75..fc593d615e7d 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -20,6 +20,7 @@ extern void __init at91_init_sram(int bank, unsigned long base,
20extern void __init at91rm9200_set_type(int type); 20extern void __init at91rm9200_set_type(int type);
21extern void __init at91_initialize(unsigned long main_clock); 21extern void __init at91_initialize(unsigned long main_clock);
22extern void __init at91x40_initialize(unsigned long main_clock); 22extern void __init at91x40_initialize(unsigned long main_clock);
23extern void __init at91rm9200_dt_initialize(void);
23extern void __init at91_dt_initialize(void); 24extern void __init at91_dt_initialize(void);
24 25
25 /* Interrupts */ 26 /* Interrupts */