Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration...
[linux-2.6.git] / arch / arm / mach-omap2 / pm.c
index 2c3a253..30af335 100644 (file)
@@ -83,7 +83,9 @@ static int _init_omap_device(char *name, struct device **new_dev)
 static void omap2_init_processor_devices(void)
 {
        _init_omap_device("mpu", &mpu_dev);
-       _init_omap_device("iva", &iva_dev);
+       if (omap3_has_iva())
+               _init_omap_device("iva", &iva_dev);
+
        if (cpu_is_omap44xx()) {
                _init_omap_device("l3_main_1", &l3_dev);
                _init_omap_device("dsp", &dsp_dev);