This reverts commit a9622f62.  Now that
the Calgary code apparently detects itself properly, it's not needed any
more.
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>