From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2011 17:04:05 +0000 (-0700)
Subject: Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e;hp=-c;p=deliverable%2Flinux.git

Merge branch 'sh-latest' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix build alloc_thread_info_node function
  sh: Fix ptrace hw_breakpoint handling
  sh: Fix ptrace fpu state initialisation
  sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED.
  sh: pmb: Use struct syscore_ops instead of sysdevs
  sh: Use struct syscore_ops instead of sysdevs
  sh: Conver to asm-generic/sizes.h.
  sh: wire up sys_syncfs.
---

4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e
diff --combined arch/sh/Kconfig
index 1fbf0c7583d0,e4be5a485d5c..9af3c8d0776b
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -23,8 -23,7 +23,7 @@@ config SUPER
  	select HAVE_SPARSE_IRQ
  	select RTC_LIB
  	select GENERIC_ATOMIC64
- 	# Support the deprecated APIs until MFD and GPIOLIB catch up.
- 	select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB
+ 	select GENERIC_HARDIRQS_NO_DEPRECATED
  	select GENERIC_IRQ_SHOW
  	help
  	  The SuperH is a RISC processor targeted for use in embedded systems
@@@ -75,9 -74,6 +74,9 @@@ config GENERIC_CSU
  config GENERIC_FIND_NEXT_BIT
  	def_bool y
  
 +config GENERIC_FIND_BIT_LE
 +	def_bool y
 +
  config GENERIC_HWEIGHT
  	def_bool y