Robert> Would an ifdef be OK? Sure, but I'm not sure what you can test on, and I'm not sure what it buys you -- you still have svn diverging from the upstream kernel, except svn has an #ifdef too. - R.