nvavp: Fix build with 3.8
Dan Willemsen [Thu, 8 Aug 2013 09:18:06 +0000 (02:18 -0700)]
Change-Id: I3a827b407d8fa7d71297a9c72645904ece2e5bc7
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/259572

drivers/media/video/tegra/nvavp/nvavp_dev.c

index 4be3152..ab92fc3 100644 (file)
@@ -39,7 +39,6 @@
 
 #include <mach/clk.h>
 #include <mach/hardware.h>
-#include <mach/iomap.h>
 #include <mach/legacy_irq.h>
 #include <mach/pm_domains.h>
 
@@ -51,6 +50,9 @@
 #endif
 #include "nvavp_os.h"
 
+/* HACK: this has to come from DT */
+#include "../../../../../arch/arm/mach-tegra/iomap.h"
+
 #define TEGRA_NVAVP_NAME                       "nvavp"
 
 #define NVAVP_PUSHBUFFER_SIZE                  4096
@@ -1758,7 +1760,6 @@ err_get_bsev_clk:
 err_get_vde_clk:
        clk_put(nvavp->cop_clk);
 err_get_cop_clk:
-err_dma_alloc:
 err_get_syncpt:
        kfree(nvavp);
        return ret;