diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 14:03:52 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 14:03:52 -0500 |
| commit | 9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080 (patch) | |
| tree | f059571830a159f05b8cdf4ec354b01ca7d6bc45 /arch/arm/mach-omap2/devices.c | |
| parent | 75431f9d7335daf7fb9e72b3a1539ce610142618 (diff) | |
| parent | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff) | |
Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 5e304d0719a2..626f3ea3142f 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -639,7 +639,7 @@ static int count_ocp2scp_devices(struct omap_ocp2scp_dev *ocp2scp_dev) | |||
| 639 | return cnt; | 639 | return cnt; |
| 640 | } | 640 | } |
| 641 | 641 | ||
| 642 | static void omap_init_ocp2scp(void) | 642 | static void __init omap_init_ocp2scp(void) |
| 643 | { | 643 | { |
| 644 | struct omap_hwmod *oh; | 644 | struct omap_hwmod *oh; |
| 645 | struct platform_device *pdev; | 645 | struct platform_device *pdev; |