https://bugs.freedesktop.org/show_bug.cgi?id=106159
--- Comment #12 from Joel Sass sass.joel@gmail.com --- Created attachment 139112 --> https://bugs.freedesktop.org/attachment.cgi?id=139112&action=edit The modified file causing the problem in my comment.
Looks like there's some missing nomenclature between the patch you'd suggested, and the kernel source I acquired from git://kernel.ubuntu.com/ubuntu/unstable.git