Merge "Updated COM8 Firmware for R8.a1.03 driver" into ics-mr1

diff --git a/omap4/sgx.tgz b/omap4/sgx.tgz
index d8feca4119af2dcc1dba7fa0b8aa49579b2ed536..3e3a9c03a2236ae8fad5aa44613e58eee7248a90 100644 (file)
Binary files a/omap4/sgx.tgz and b/omap4/sgx.tgz differ

diff --git a/omap4/sgx/Android.mk b/omap4/sgx/Android.mk
index e0cc56a8d6a953a9e61cb813cb99cecba5ce7e40..8b9f258292410f3f4f7f6ad4b333c680b623b23e 100644 (file)
--- a/omap4/sgx/Android.mk
+++ b/omap4/sgx/Android.mk
@@ -62,6 +62,7 @@ prebuilt_sgx_vendor_libs := \
        lib/libusc_SGX540_120.so \
        lib/libPVRScopeServices_SGX540_120.so \
        lib/libsrv_um_SGX540_120.so \
+       lib/hw/gralloc.omap4430.so \
        lib/hw/gralloc.omap4460.so \
        lib/libpvrANDROID_WSEGL_SGX540_120.so \
        lib/libpvr2d_SGX540_120.so \

diff --git a/wl12xx/wpan.tgz b/wl12xx/wpan.tgz
index 79c87e3978ffe5cf78cb84708853510e5b006414..feac09e074522053ff11615c8086e7311208cd8d 100644 (file)
Binary files a/wl12xx/wpan.tgz and b/wl12xx/wpan.tgz differ