From:  Frank Davis <fdavis@si.rr.com>

  This patch makes us of a new predefined macro, instead of having the code
  directly in the driver.