Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core · 47724df337 - Gogs

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Ingo Molnar 14 years ago

parent

ee8f967b15 abcefec31e

commit

47724df337

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/m32r/Kconfig
							 
								View File
							
				@@ -10,6 +10,7 @@ config M32R
			
				 	select HAVE_GENERIC_HARDIRQS
			
				 	select GENERIC_IRQ_PROBE
			
				 	select GENERIC_IRQ_SHOW
			
				+	select GENERIC_ATOMIC64
			
				 config SBUS
			
				 	bool