summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/sr_device.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-21 02:42:24 +0400
committerArnd Bergmann <arnd@arndb.de>2012-03-21 02:42:24 +0400
commitf907ab06bb021bcb91d39c8d1b36536ebdb318fa (patch)
tree6020618997a6ea1b5f5b59c89df35344023f7c82 /arch/arm/mach-omap2/sr_device.c
parent7cc026f21e2acdcea8640df5da470c6fdca92911 (diff)
parent489e7bece7f6859a7df484a4dce08fa51fb0d876 (diff)
downloadlinux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.tar.xz
Merge branch 'next/fixes-non-critical' into next/drivers
Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/sr_device.c')
-rw-r--r--arch/arm/mach-omap2/sr_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c
index 60293370a2a7..a503e1e8358c 100644
--- a/arch/arm/mach-omap2/sr_device.c
+++ b/arch/arm/mach-omap2/sr_device.c
@@ -69,7 +69,7 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
sr_data->nvalue_count = count;
}
-static int sr_dev_init(struct omap_hwmod *oh, void *user)
+static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
{
struct omap_sr_data *sr_data;
struct platform_device *pdev;