This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>