Merge branch 'eseries' into pxa

Conflicts:

	arch/arm/mach-pxa/Makefile

diff --combined arch/arm/mach-pxa/Kconfig
index 7f9664dee6703f9f74cdc42aa42b170ce2ccc804,55e8d2f10dd3fce9b2a9433a137d24292634bbdf..fdea1e7dc349906ee642eb06367072bcb9f9f99f
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -124,10 -124,19 +124,19 @@@ config MACH_E33
          Say Y here if you intend to run this kernel on a Toshiba
          e330 family PDA.
  
+ config MACH_E350
+       bool "Toshiba e350"
+       default y
+       depends on ARCH_PXA_ESERIES
+       help
+         Say Y here if you intend to run this kernel on a Toshiba
+         e350 family PDA.
+ 
  config MACH_E740
        bool "Toshiba e740"
        default y
        depends on ARCH_PXA_ESERIES
+       select FB_W100
        help
          Say Y here if you intend to run this kernel on a Toshiba
          e740 family PDA.
@@@ -136,6 -145,7 +145,7 @@@ config MACH_E75
        bool "Toshiba e750"
        default y
        depends on ARCH_PXA_ESERIES
+       select FB_W100
        help
          Say Y here if you intend to run this kernel on a Toshiba
          e750 family PDA.
@@@ -152,6 -162,7 +162,7 @@@ config MACH_E80
        bool "Toshiba e800"
        default y
        depends on ARCH_PXA_ESERIES
+       select FB_W100
        help
          Say Y here if you intend to run this kernel on a Toshiba
          e800 family PDA.
@@@ -189,6 -200,7 +200,6 @@@ config MACH_ARMCOR
  
  config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
 -      depends on ARCH_PXA
        select PXA27x
        select IWMMXT
  
@@@ -198,20 -210,6 +209,20 @@@ config MACH_PCM02
        select IWMMXT
        select PXA_SSP
  
 +config ARCH_PXA_PALM
 +      bool "PXA based Palm PDAs"
 +      select HAVE_PWM
 +
 +config MACH_PALMTX
 +      bool "Palm T|X"
 +      default y
 +      depends on ARCH_PXA_PALM
 +      select PXA27x
 +      select IWMMXT
 +      help
 +        Say Y here if you intend to run this kernel on a Palm T|X
 +        handheld computer.
 +
  config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
        select HAVE_PWM
@@@ -233,42 -231,6 +244,42 @@@ config PCM990_DISPLAY_NON
  endchoice
  
  
 +config PXA_EZX
 +      bool "Motorola EZX Platform"
 +      select PXA27x
 +      select IWMMXT
 +      select HAVE_PWM
 +
 +config MACH_EZX_A780
 +      bool "Motorola EZX A780"
 +      default y
 +      depends on PXA_EZX
 +
 +config MACH_EZX_E680
 +      bool "Motorola EZX E680"
 +      default y
 +      depends on PXA_EZX
 +
 +config MACH_EZX_A1200
 +      bool "Motorola EZX A1200"
 +      default y
 +      depends on PXA_EZX
 +
 +config MACH_EZX_A910
 +      bool "Motorola EZX A910"
 +      default y
 +      depends on PXA_EZX
 +
 +config MACH_EZX_E6
 +      bool "Motorola EZX E6"
 +      default y
 +      depends on PXA_EZX
 +
 +config MACH_EZX_E2
 +      bool "Motorola EZX E2"
 +      default y
 +      depends on PXA_EZX
 +
  endmenu
  
  config PXA25x
@@@ -310,13 -272,4 +321,13 @@@ config PXA_PW
        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

diff --combined arch/arm/mach-pxa/Makefile
index b282412a01f55a2ab729d1b71b05fcedf0fef62b,f2b77ef43f2c61edeb12192bf2a70d3a8648694d..5220a5c3fe90f220a1e182b4b7413bc42377a4c3
--- 1/arch/arm/mach-pxa/Makefile
--- 2/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  
  # Common support (must be linked before board specific support)
  obj-y                         += clock.o devices.o generic.o irq.o dma.o \
 -                                 time.o gpio.o
 +                                 time.o gpio.o reset.o
  obj-$(CONFIG_PM)              += pm.o sleep.o standby.o
  obj-$(CONFIG_CPU_FREQ)                += cpu-pxa.o
  
@@@ -36,8 -36,11 +36,12 @@@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += 
  obj-$(CONFIG_MACH_TOSA)               += tosa.o
  obj-$(CONFIG_MACH_EM_X270)    += em-x270.o
  obj-$(CONFIG_MACH_MAGICIAN)   += magician.o
- obj-$(CONFIG_ARCH_PXA_ESERIES)        += eseries.o
- obj-$(CONFIG_MACH_PALMTX)+= palmtx.o
+ obj-$(CONFIG_ARCH_PXA_ESERIES)        += eseries.o eseries_udc.o
+ obj-$(CONFIG_MACH_E740)               += e740_lcd.o
+ obj-$(CONFIG_MACH_E750)               += e750_lcd.o
+ obj-$(CONFIG_MACH_E400)               += e400_lcd.o
+ obj-$(CONFIG_MACH_E800)               += e800_lcd.o
++obj-$(CONFIG_MACH_PALMTX)     += palmtx.o
  
  ifeq ($(CONFIG_MACH_ZYLONITE),y)
    obj-y                               += zylonite.o
@@@ -47,7 -50,6 +51,7 @@@ endi
  obj-$(CONFIG_MACH_LITTLETON)  += littleton.o
  
  obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o
 +obj-$(CONFIG_PXA_EZX)           += ezx.o
  
  # Support for blinky lights
  led-y := leds.o
@@@ -61,5 -63,3 +65,5 @@@ obj-$(CONFIG_LEDS)            += $(led-y
  ifeq ($(CONFIG_PCI),y)
  obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
  endif
 +
 +obj-$(CONFIG_TOSA_BT)         += tosa-bt.o