There is no "correct" behavior in this regard. Keeping it makes the backports of upstream patches harder, thus it's incorrect. OTOH, removing it makes the out-of-tree driver harder, thus it's incorrect. But judging from the number of backports we've done, following the upstream development of the newer kernel versions is the more sensible way to go, IMO.