diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-27 23:03:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-27 23:03:12 -0400 |
| commit | 17c6dd8144924e3c71930636091704da6d043536 (patch) | |
| tree | 60eb6926ac8affb7040795350104feb3e55fad1c /arch/arm/mach-omap2/devices.c | |
| parent | 34c27a497ab0e9ca28eb1bd572907ba8a154ad50 (diff) | |
| parent | 4fa8eebb045a6d798011f3935a38dd29de30e6c9 (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
hwspinlock: depend on OMAP4
ARM: OMAP2+: Fix warnings for GPMC interrupt
OMAP4: PandaBoard: remove unused power regulators
arm: mach-omap2: omap_l3_smx: fix irq handler setup
arm: mach-omap2: devices: fix omap3_l3_init() return value
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 e97851492847..84d1b735fe80 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -66,7 +66,7 @@ static int __init omap3_l3_init(void) | |||
| 66 | 66 | ||
| 67 | WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name); | 67 | WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name); |
| 68 | 68 | ||
| 69 | return PTR_ERR(od); | 69 | return IS_ERR(od) ? PTR_ERR(od) : 0; |
| 70 | } | 70 | } |
| 71 | postcore_initcall(omap3_l3_init); | 71 | postcore_initcall(omap3_l3_init); |
| 72 | 72 | ||