diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-30 14:58:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-02 21:50:06 +0200 |
| commit | 5c5f0421a8eea5bdaba9b9313c5bb4833aeb39cd (patch) | |
| tree | 1bd88b4ae9bf5444d1c99322153ac025dcce3b1f /arch/arm/mach-imx/src.c | |
| parent | 8b85143e5dc428e8023bd741dfa9ec2e64ff4525 (diff) | |
| download | blackbird-op-linux-5c5f0421a8eea5bdaba9b9313c5bb4833aeb39cd.tar.gz blackbird-op-linux-5c5f0421a8eea5bdaba9b9313c5bb4833aeb39cd.zip | |
ARM: imx: reset_controller may be disabled
The new reset controller API is optional, so if that is disabled,
we must not call it from platform code.
arch/arm/mach-imx/built-in.o: In function
`imx_src_init': /git/arm-soc/arch/arm/mach-imx/src.c:144:
undefined reference to `reset_controller_register'
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/src.c')
| -rw-r--r-- | arch/arm/mach-imx/src.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c index dec641108b54..4e0236c89c5e 100644 --- a/arch/arm/mach-imx/src.c +++ b/arch/arm/mach-imx/src.c @@ -138,7 +138,8 @@ void __init imx_src_init(void) WARN_ON(!src_base); imx_reset_controller.of_node = np; - reset_controller_register(&imx_reset_controller); + if (IS_ENABLED(CONFIG_RESET_CONTROLLER)) + reset_controller_register(&imx_reset_controller); /* * force warm reset sources to generate cold reset |
