-stable review patch. If anyone has any objections, please let us know.

------------------From: Andrew de Quincey <adq_dvb@lidskialf.net>

Currently I am doing lots of refactoring work in the dvb tree. Thisbugfix became necessary to fix 2.6.17 whilst I was in the middle of thiswork. Unfortunately after I tested the original code for the patch, Igenerated the diff against the wrong tree (I accidentally used a treewith part of the refactoring code in it). This resulted in the reportedcompile errors because that tree (a) was incomplete, and (b) usedfeatures which are simply not in the mainline kernel yet.