diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2012-11-27 15:24:12 -0600 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2012-12-14 10:14:50 -0600 |
| commit | e0c3e27ce19fcc81156ba49c91d83a676144a103 (patch) | |
| tree | 2810582504f61a9ba4404154ceb18075fed38ff3 /arch/arm/mach-omap2 | |
| parent | 34cceb7464f2db0da4da900afa82a210f4470b89 (diff) | |
| download | linux-e0c3e27ce19fcc81156ba49c91d83a676144a103.tar.bz2 | |
ARM: AM335x: Fix warning in timer.c
When compiling the kernel with configuration options ...
# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
CONFIG_SOC_AM33XX=y
... the following build warning is seen.
CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:395:19: warning: ‘omap2_sync32k_clocksource_init’
defined but not used [-Wunused-function]
This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove
CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no
longer referenced by the timer initialisation function for the AM335x
device as it has no 32k-sync timer.
Fix this by adding the "__maybe_unused" compiler directive to the
omap2_sync32k_clocksource_init() function to indicate that this function
may be used for certain configurations.
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 7016637b531c..e2ffe0adc28b 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -392,7 +392,7 @@ static struct of_device_id omap_counter_match[] __initdata = { }; /* Setup free-running counter for clocksource */ -static int __init omap2_sync32k_clocksource_init(void) +static int __init __maybe_unused omap2_sync32k_clocksource_init(void) { int ret; struct device_node *np = NULL; |