techmik@kragar ~/codeaurora/hardware/qcom/camera $ git branch
* jb
  jb_rel
techmik@kragar ~/codeaurora/hardware/qcom/camera $ git diff jb_rel
diff --git a/Android.mk b/Android.mk
index 31d16ab..43f0a58 100755
--- a/Android.mk
+++ b/Android.mk
@@ -43,9 +43,9 @@ ifneq ($(USE_CAMERA_STUB),true)
         LOCAL_CFLAGS += -DCAMERA_GRALLOC_CACHING_ID=0
       else ifeq ($(call is-chipset-prefix-in-board-platform,msm8660),true)
         LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_CAMERA_HEAP
-        LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_CAMERA_HEAP # Don't Care
-        LOCAL_CFLAGS += -DCAMERA_ION_FALLBACK_HEAP_ID=ION_CAMERA_HEAP_ID # EBI
-        LOCAL_CFLAGS += -DCAMERA_ZSL_ION_FALLBACK_HEAP_ID=ION_CAMERA_HEAP_ID
+        LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP # Don't Care
+        LOCAL_CFLAGS += -DCAMERA_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID # EBI
+        LOCAL_CFLAGS += -DCAMERA_ZSL_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID
         LOCAL_CFLAGS += -DCAMERA_GRALLOC_CACHING_ID=0
       else
         LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_ADSP_HEAP
@@ -56,18 +56,20 @@ ifneq ($(USE_CAMERA_STUB),true)
       endif

       ifeq ($(V4L2_BASED_LIBCAM),true)