The next patch will need it further up in the file, so
move it unchanged now.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>