Merge branch 'pxa-tosa' into pxa
Russell King [Sat, 12 Jul 2008 20:43:01 +0000 (21:43 +0100)]
Conflicts:

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

1  2 
MAINTAINERS
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/mfd/Kconfig
include/asm-arm/arch-pxa/hardware.h
include/asm-arm/arch-pxa/system.h

diff --cc MAINTAINERS
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge