From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:08:32 +0000 (+0100)
Subject: Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cc513ac0f29473de365664c4fba9cf033c1f2324;p=linux-2.6-omap-h63xx.git

Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
	drivers/pcmcia/Kconfig
	drivers/pcmcia/Makefile
---

cc513ac0f29473de365664c4fba9cf033c1f2324
diff --cc arch/arm/mach-pxa/Kconfig
index 5548abd6390,3ed5b2642c2..f781873431f
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -48,11 -50,8 +50,12 @@@ config MACH_MAINSTON
  	bool "Intel HCDDBBVA0 Development Platform"
  	select PXA27x
  	select HAVE_PWM
+ 	select PXA_HAVE_BOARD_IRQS
  
 +config MACH_MP900C
 +	bool "Nec Mobilepro 900/c"
 +	select PXA25x
 +
  config ARCH_PXA_IDP
  	bool "Accelent Xscale IDP"
  	select PXA25x
@@@ -255,19 -229,8 +269,20 @@@ config MACH_MAGICIA
  	bool "Enable HTC Magician Support"
  	select PXA27x
  	select IWMMXT
+ 	select PXA_HAVE_BOARD_IRQS
  
 +config MACH_MIOA701
 +	bool "Mitac Mio A701 Support"
 +	select PXA27x
 +	select IWMMXT
 +	select LEDS_GPIO
 +	select HAVE_PWM
 +	select GPIO_SYSFS
 +	help
 +	  Say Y here if you intend to run this kernel on a
 +	  MIO A701. Currently there is only basic support
 +	  for this PDA.
 +
  config MACH_PCM027
  	bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
  	select PXA27x
diff --cc arch/arm/mach-pxa/Makefile
index 30936e40fea,c8a47ccec81..3d2dea4afb8
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@@ -38,14 -37,13 +38,17 @@@ 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 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_MIOA701)	+= mioa701.o mioa701_bootresume.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_ARCH_PXA_ESERIES)	+= eseries.o
++obj-$(CONFIG_MACH_E330)		+= e330.o
++obj-$(CONFIG_MACH_E350)		+= e350.o
++obj-$(CONFIG_MACH_E740)		+= e740.o
++obj-$(CONFIG_MACH_E750)		+= e750.o
++obj-$(CONFIG_MACH_E400)		+= e400.o
++obj-$(CONFIG_MACH_E800)		+= e800.o
  obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o
 +obj-$(CONFIG_MACH_PALMZ72)	+= palmz72.o
+ obj-$(CONFIG_ARCH_VIPER)	+= viper.o
  
  ifeq ($(CONFIG_MACH_ZYLONITE),y)
    obj-y				+= zylonite.o
diff --cc drivers/pcmcia/Kconfig
index 40417d3fe50,de57e7e1786..f57eeae3830
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@@ -220,7 -220,7 +220,8 @@@ config PCMCIA_PXA2X
  	tristate "PXA2xx support"
  	depends on ARM && ARCH_PXA && PCMCIA
  	depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
- 		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA)
 -		    || MACH_ARMCORE || ARCH_PXA_PALM || ARCH_VIPER)
++		    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
++		    || ARCH_VIPER)
  	help
  	  Say Y here to include support for the PXA2xx PCMCIA controller
  
diff --cc drivers/pcmcia/Makefile
index 679ca927a62,76e859073cb..8c2fe94122a
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -71,8 -71,7 +71,8 @@@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= s
  pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)		+= pxa2xx_lubbock.o sa1111_generic.o
  pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o
  pxa2xx_cs-$(CONFIG_PXA_SHARPSL)			+= pxa2xx_sharpsl.o
 -pxa2xx_cs-$(CONFIG_MACH_ARMCORE)		+= pxa2xx_cm_x270.o
 +pxa2xx_cs-$(CONFIG_MACH_ARMCORE)		+= pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
+ pxa2xx_cs-$(CONFIG_ARCH_VIPER)			+= pxa2xx_viper.o
 -pxa2xx_cs-$(CONFIG_MACH_PALMTX)		+= pxa2xx_palmtx.o
 -
 +pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA)		+= pxa2xx_trizeps.o
 +pxa2xx_cs-$(CONFIG_MACH_PALMTX)			+= pxa2xx_palmtx.o
 +pxa2xx_cs-$(CONFIG_MACH_PALMLD)			+= pxa2xx_palmld.o
-