This lets us fix the build error that happens when these two trees are merged
together.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>