From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Jul 2008 20:43:01 +0000 (+0100)
Subject: Merge branch 'pxa-tosa' into pxa
X-Git-Tag: v2.6.27-rc1~850^2^2~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b;p=linux-2.6-omap-h63xx.git

Merge branch 'pxa-tosa' into pxa

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/tosa.c
	arch/arm/mach-pxa/spitz.c
---

7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b
diff --cc arch/arm/mach-pxa/Kconfig
index 1a7ceb8866f,6c162f8fdce..7f9664dee67
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -305,9 -274,11 +305,18 @@@ config PXA_SS
  	help
  	  Enable support for PXA2xx SSP ports
  
 +config PXA_PWM
 +	tristate
 +	default BACKLIGHT_PWM
 +	help
 +	  Enable support for PXA2xx/PXA3xx PWM controllers
++
+ config TOSA_BT
+ 	tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
+ 	depends on MACH_TOSA
+ 	select RFKILL
+ 	help
+ 	  This is a simple driver that is able to control
+ 	  the state of built in bluetooth chip on tosa.
++
  endif