This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>