diff --git a/[refs] b/[refs] index 2d1bba02be4f..d520891ecdb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9ed27dfcd8b68de90dc285acd9e7c7113964888 +refs/heads/master: 5bf8f6bfc950abe23927e0ff54cdb260d19d608e diff --git a/trunk/arch/openrisc/Kconfig b/trunk/arch/openrisc/Kconfig index a4787197d8fe..be04485431fe 100644 --- a/trunk/arch/openrisc/Kconfig +++ b/trunk/arch/openrisc/Kconfig @@ -17,6 +17,7 @@ config OPENRISC select GENERIC_IOMAP select GENERIC_CPU_DEVICES select GENERIC_ATOMIC64 + select GENERIC_CLOCKEVENTS config MMU def_bool y @@ -46,9 +47,6 @@ config NO_IOPORT config GENERIC_GPIO def_bool y -config GENERIC_CLOCKEVENTS - def_bool y - config TRACE_IRQFLAGS_SUPPORT def_bool y