diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-07-16 01:57:59 +0100 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-07-16 01:57:59 +0100 |
| commit | e22956a2faa9cf34cec4a471131d50c6be75b0c2 (patch) | |
| tree | 711e907ded2c7fd024de24e57073d292296b3fd7 /arch/arm/mach-imx/mach-mx31lite.c | |
| parent | 9491e34defaa03e18241e1e65352eb7c1d7215ed (diff) | |
| parent | 49099c4991da3c94773f888aea2e9d27b8a7c6d1 (diff) | |
Merge branch 'drm-core-next'
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lite.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index 0abef5f13df..686c6058798 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c @@ -283,7 +283,7 @@ static void __init mx31lite_timer_init(void) mx31_clocks_init(26000000); } -struct sys_timer mx31lite_timer = { +static struct sys_timer mx31lite_timer = { .init = mx31lite_timer_init, }; |