pull request - kernel 3.4 DS

These two commits will make it buildable (now working and etc, no idea - didn't flash it)