Minor changes for GCC-4.7 compilation on new 3.4 kernel

Change-Id: I6abce3a7a751376d4673243c546112a494138a46