Reverts two bogus changes, one of which we already reverted and one in code that we don't build. svn path=/dists/sid/linux-2.6/; revision=15822
(Closes: #559406) svn path=/dists/sid/linux-2.6/; revision=15820