Revert "Changes to make it compile with Google's GCC 4.7 toolchain."

This reverts commit 5ef72e02d182bf3c0728cb09bb2b00798382705d.

Conflicts:

	drivers/staging/prima/CORE/WDI/CP/inc/wlan_qct_wdi_i.h