diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index d316ccf..fcd87f8 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -132,19 +132,17 @@
     HAL_PIXEL_FORMAT_RGBA_4444          = 7,
     /* 0x8 - 0xF range unavailable */
     HAL_PIXEL_FORMAT_YCbCr_422_SP       = 0x10,     // NV16
-    HAL_PIXEL_FORMAT_YCrCb_420_SP       = 0x11,     // NV21 (_adreno)
+    HAL_PIXEL_FORMAT_YCrCb_420_SP       = 0x11,     // NV21
     HAL_PIXEL_FORMAT_YCbCr_422_P        = 0x12,     // IYUV
     HAL_PIXEL_FORMAT_YCbCr_420_P        = 0x13,     // YUV9
-    HAL_PIXEL_FORMAT_YCbCr_422_I        = 0x14,     // YUY2 (_adreno)
+    HAL_PIXEL_FORMAT_YCbCr_422_I        = 0x14,     // YUY2
     /* 0x15 reserved */
-    HAL_PIXEL_FORMAT_CbYCrY_422_I       = 0x16,     // UYVY (_adreno)
+    HAL_PIXEL_FORMAT_CbYCrY_422_I       = 0x16,     // UYVY
     /* 0x17 reserved */
     /* 0x18 - 0x1F range unavailable */
     HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED = 0x20,     // NV12_adreno_tiled
     HAL_PIXEL_FORMAT_YCbCr_420_SP       = 0x21,     // NV12
-    HAL_PIXEL_FORMAT_YCrCb_420_SP_TILED = 0x22,     // NV21_adreno_tiled
-    HAL_PIXEL_FORMAT_YCrCb_422_SP       = 0x23,     // NV61
-    HAL_PIXEL_FORMAT_YCrCb_422_P        = 0x24,     // YV12 (_adreno)
+    HAL_PIXEL_FORMAT_YCrCb_422_SP       = 0x22,     // NV61
 };
 
 /* fourcc mapping for the YUV formats. see http://www.fourcc.org */
@@ -157,9 +155,7 @@
     HAL_PIXEL_FORMAT_UYVY               = HAL_PIXEL_FORMAT_CbYCrY_422_I,
     HAL_PIXEL_FORMAT_NV12_ADRENO_TILED  = HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED,
     HAL_PIXEL_FORMAT_NV12               = HAL_PIXEL_FORMAT_YCbCr_420_SP,
-    HAL_PIXEL_FORMAT_NV21_ADRENO_TILED  = HAL_PIXEL_FORMAT_YCrCb_420_SP_TILED,
-    HAL_PIXEL_FORMAT_NV61               = HAL_PIXEL_FORMAT_YCrCb_422_SP,
-    HAL_PIXEL_FORMAT_YV12               = HAL_PIXEL_FORMAT_YCrCb_422_P
+    HAL_PIXEL_FORMAT_NV61               = HAL_PIXEL_FORMAT_YCrCb_422_SP
 };
 
 /**