projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: sunxi: allow building without reset controller
[cascardo/linux.git]
/
arch
/
arm
/
mach-sunxi
/
sunxi.c
diff --git
a/arch/arm/mach-sunxi/sunxi.c
b/arch/arm/mach-sunxi/sunxi.c
index
ff2e6a4
..
3f9587b
100644
(file)
--- a/
arch/arm/mach-sunxi/sunxi.c
+++ b/
arch/arm/mach-sunxi/sunxi.c
@@
-35,7
+35,8
@@
extern void __init sun6i_reset_init(void);
static void __init sun6i_timer_init(void)
{
of_clk_init(NULL);
- sun6i_reset_init();
+ if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
+ sun6i_reset_init();
clocksource_of_init();
}