summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_hwmod.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-09-15 16:06:11 -0700
committerTony Lindgren <tony@atomide.com>2011-09-15 16:06:11 -0700
commitceb1c532ba6220900e61ec7073a9234661efa450 (patch)
treeb7c5b94f09a6893625bb12b7795de3d44fece450 /arch/arm/mach-omap2/omap_hwmod.c
parent8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff)
parent00c46b3069c1ee9aa31db3057e9224685af52efa (diff)
downloadblackbird-op-linux-ceb1c532ba6220900e61ec7073a9234661efa450.tar.gz
blackbird-op-linux-ceb1c532ba6220900e61ec7073a9234661efa450.zip
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 84cc0bdda3ae..d71380705080 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1954,9 +1954,6 @@ int __init omap_hwmod_register(struct omap_hwmod **ohs)
i = 0;
do {
- if (!omap_chip_is(ohs[i]->omap_chip))
- continue;
-
r = _register(ohs[i]);
WARN(r, "omap_hwmod: %s: _register returned %d\n", ohs[i]->name,
r);
OpenPOWER on IntegriCloud