Commit e4cc8fca authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

	arch/arm/configs/magician_defconfig
parents ae1a25da 432dc14f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ P: Dirk Opfer 
M:	dirk@opfer-online.de

S:	Maintained



ARM/PALMTX SUPPORT

ARM/PALMTX,PALMT5,PALMLD SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

W:	http://hackndev.com

arch/arm/configs/xm_x2xx_defconfig→arch/arm/configs/cm_x2xx_defconfig

+311 −155

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/em_x270_defconfig

0 → 100644
+1741 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/magician_defconfig

+524 −175

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+25 −0
Original line number Diff line number Diff line
@@ -254,6 +254,10 @@ config MACH_EM_X270 
	bool "CompuLab EM-x270 platform"

	select PXA27x



config MACH_EXEDA

	bool "CompuLab eXeda platform"

	select PXA27x



config MACH_COLIBRI

	bool "Toradex Colibri PX27x"

	select PXA27x
@@ -295,6 +299,7 @@ config MACH_MAGICIAN 
	bool "Enable HTC Magician Support"

	select PXA27x

	select IWMMXT

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_MIOA701
@@ -319,6 +324,16 @@ config ARCH_PXA_PALM 
	bool "PXA based Palm PDAs"

	select HAVE_PWM



config MACH_PALMT5

	bool "Palm Tungsten|T5"

	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 Tungsten|T5

	  handheld computer.



config MACH_PALMTX

	bool "Palm T|X"

	default y
@@ -339,6 +354,16 @@ config MACH_PALMZ72 
	  Say Y here if you intend to run this kernel on Palm Zire 72

	  handheld computer.



config MACH_PALMLD

	bool "Palm LifeDrive"

	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 LifeDrive

	  handheld computer.



config MACH_PCM990_BASEBOARD

	bool "PHYTEC PCM-990 development board"

	select HAVE_PWM

CRA Git | Maintained and supported by SUSTech CRA and CCSE